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
This commit is contained in:
parent
19fe166d57
commit
84387a1880
1 changed files with 9 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue