Ensure ringing continues for branched calls after progress is received

While waiting for an answer, don't send progress for branched calls
for which ringing was sent.

(closes issue #15028)
Reported by: fnordian


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@223804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-10-12 23:12:50 +00:00
parent 0a226d933f
commit e3464ac40a
+7 -2
View File
@@ -654,8 +654,13 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct dial_l
/* Setup early media if appropriate */
if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_rtp_early_bridge(in, c);
if (!ast_test_flag(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROGRESS);
if (!ast_test_flag(outgoing, OPT_RINGBACK)) {
if (single || (!single && !(*sentringing))) {
/* want progress to go through if it's a single legged call or it's a
* branched call and ringing has not been sent */
ast_indicate(in, AST_CONTROL_PROGRESS);
}
}
break;
case AST_CONTROL_VIDUPDATE:
if (option_verbose > 2)