From: Russell Bryant Date: Tue, 24 Apr 2007 16:17:36 +0000 (+0000) Subject: Merged revisions 61774 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2815 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90f152b24f5b0156eb0745dc9d525a4c6ced6bc7;p=thirdparty%2Fasterisk.git Merged revisions 61774 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r61774 | russell | 2007-04-24 11:16:41 -0500 (Tue, 24 Apr 2007) | 5 lines Add a few more state changes in handle_frame_ownerless() so that the SLA code will get notified of these changes even when an owner channel is not provided. This isn't from a specific bug report, it's just something I noticed while poking around. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61775 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/dial.c b/main/dial.c index a3fcd99922..fc0af983c3 100644 --- a/main/dial.c +++ b/main/dial.c @@ -343,11 +343,13 @@ static void handle_frame(struct ast_dial *dial, struct ast_dial_channel *channel ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", channel->owner->name); if (!dial->options[AST_DIAL_OPTION_MUSIC]) ast_indicate(chan, AST_CONTROL_RINGING); + set_state(dial, AST_DIAL_RESULT_RINGING); break; case AST_CONTROL_PROGRESS: if (option_verbose > 2) ast_verbose (VERBOSE_PREFIX_3 "%s is making progress, passing it to %s\n", channel->owner->name, chan->name); ast_indicate(chan, AST_CONTROL_PROGRESS); + set_state(dial, AST_DIAL_RESULT_PROGRESS); break; case AST_CONTROL_VIDUPDATE: if (option_verbose > 2) @@ -358,6 +360,7 @@ static void handle_frame(struct ast_dial *dial, struct ast_dial_channel *channel if (option_verbose > 2) ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding, passing it to %s\n", channel->owner->name, chan->name); ast_indicate(chan, AST_CONTROL_PROCEEDING); + set_state(dial, AST_DIAL_RESULT_PROCEEDING); break; case AST_CONTROL_HOLD: if (option_verbose > 2)