diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-15 21:36:13 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-15 21:36:13 +0000 |
| commit | 84387a188042c1a3c141476d8a1ce7789950bae1 (patch) | |
| tree | 76dc2614a0a95aa006fc7a64b736b4e67b329f41 /main | |
| parent | 19fe166d577b24466d52c19bcbd477eba506d60d (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@47708 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/main/channel.c b/main/channel.c index ace4a41e5..a1fc401d3 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; } } |