mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Issue #6439 - the "timebomb" bug. Patch by Markster over GPRS
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@8632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3235,11 +3235,14 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
|
||||
res = AST_BRIDGE_RETRY;
|
||||
break;
|
||||
}
|
||||
if (bridge_end.tv_sec) {
|
||||
to = ast_tvdiff_ms(bridge_end, ast_tvnow());
|
||||
if (to <= 0) {
|
||||
res = AST_BRIDGE_RETRY;
|
||||
break;
|
||||
}
|
||||
} else
|
||||
to = -1;
|
||||
who = ast_waitfor_n(cs, 2, &to);
|
||||
if (!who) {
|
||||
ast_log(LOG_DEBUG, "Nobody there, continuing...\n");
|
||||
|
Reference in New Issue
Block a user