From 0f15e43add18b8dfdd4da95afa5fdda1451d6892 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 15 Nov 2006 21:36:13 +0000 Subject: [PATCH] Merged revisions 47707 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47707 | file | 2006-11-15 16:33:41 -0500 (Wed, 15 Nov 2006) | 2 lines We need to ensure timelimit stuff is included as well so warnings get played. (issue #8050 reported by KNK) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47708 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/main/channel.c b/main/channel.c index ace4a41..a1fc401 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3658,7 +3658,10 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct if (bridge_end.tv_sec) { to = ast_tvdiff_ms(bridge_end, ast_tvnow()); if (to <= 0) { - res = AST_BRIDGE_COMPLETE; + if (config->timelimit) + res = AST_BRIDGE_RETRY; + else + res = AST_BRIDGE_COMPLETE; break; } } else @@ -3851,8 +3854,11 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha now = ast_tvnow(); to = ast_tvdiff_ms(nexteventts, now); if (to <= 0) { - res = AST_BRIDGE_COMPLETE; - break; + if (!config->timelimit) { + res = AST_BRIDGE_COMPLETE; + break; + } + to = 0; } } -- 1.7.9.5