[svn-commits] russell: trunk r61775 - in /trunk: ./ main/dial.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Apr 24 11:17:36 2007
New Revision: 61775

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61775
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/main/dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/dial.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dial.c?view=diff&rev=61775&r1=61774&r2=61775
==============================================================================
--- trunk/main/dial.c (original)
+++ trunk/main/dial.c Tue Apr 24 11:17:36 2007
@@ -343,11 +343,13 @@
 				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 @@
 			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)