kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-10 11:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

We need to ensure timelimit stuff is included as well so warnings get played. (issue #8050 reported by KNK)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2006-11-15 21:33:41 +00:00
parent 3302cbea3e
commit cb11263607
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/channel.c
View File

@@ -3648,6 +3648,9 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
if (bridge_end.tv_sec) { if (bridge_end.tv_sec) {
to = ast_tvdiff_ms(bridge_end, ast_tvnow()); to = ast_tvdiff_ms(bridge_end, ast_tvnow());
if (to <= 0) { if (to <= 0) {
if (config->timelimit)
res = AST_BRIDGE_RETRY;
else
res = AST_BRIDGE_COMPLETE; res = AST_BRIDGE_COMPLETE;
break; break;
} }
@@ -3828,9 +3831,12 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
now = ast_tvnow(); now = ast_tvnow();
to = ast_tvdiff_ms(nexteventts, now); to = ast_tvdiff_ms(nexteventts, now);
if (to <= 0) { if (to <= 0) {
if (!config->timelimit) {
res = AST_BRIDGE_COMPLETE; res = AST_BRIDGE_COMPLETE;
break; break;
} }
to = 0;
}
} }
if (config->timelimit) { if (config->timelimit) {