kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #6439 - the "timebomb" bug. Patch by Markster over GPRS

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@8632 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2006-01-25 09:46:43 +00:00
parent aca3c1f79d
commit dc08bd8501
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channel.c
View File

@@ -3235,11 +3235,14 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
res = AST_BRIDGE_RETRY; res = AST_BRIDGE_RETRY;
break; break;
} }
to = ast_tvdiff_ms(bridge_end, ast_tvnow()); if (bridge_end.tv_sec) {
if (to <= 0) { to = ast_tvdiff_ms(bridge_end, ast_tvnow());
res = AST_BRIDGE_RETRY; if (to <= 0) {
break; res = AST_BRIDGE_RETRY;
} break;
}
} else
to = -1;
who = ast_waitfor_n(cs, 2, &to); who = ast_waitfor_n(cs, 2, &to);
if (!who) { if (!who) {
ast_log(LOG_DEBUG, "Nobody there, continuing...\n"); ast_log(LOG_DEBUG, "Nobody there, continuing...\n");