[asterisk-commits] dlee: trunk r397295 - in /trunk/res: res_stasis.c stasis/control.h

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed Aug 21 11:00:10 2013
New Revision: 397295

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397295
Log:
res_stasis: remove call to missing function control_continue.

In the shuffling around of res_stasis, control_continue was renamed to
stasis_app_control_continue, but the call in res_stasis wasn't updated.
In looking into it, it turns out it wasn't really the right thing to do
in res_stasis anyways.

This patch changes the handling of received a AST_CONTROL_HANGUP frame
to be the same as receiving a NULL frame, and removed the declaration of
control_continue(), since it doesn't exist any more.

(closes issue ASTERISK-22292)
Reported by: Denis Smirnov

Modified:
    trunk/res/res_stasis.c
    trunk/res/stasis/control.h

Modified: trunk/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis.c?view=diff&rev=397295&r1=397294&r2=397295
==============================================================================
--- trunk/res/res_stasis.c (original)
+++ trunk/res/res_stasis.c Wed Aug 21 11:00:10 2013
@@ -631,24 +631,19 @@
 
 		f = ast_read(chan);
 		if (!f) {
-			ast_debug(3,
-				"%s: No more frames. Must be done, I guess.\n",
+			/* Continue on in the dialplan */
+			ast_debug(3, "%s: Hangup (no more frames)\n",
 				ast_channel_uniqueid(chan));
 			break;
 		}
 
-		switch (f->frametype) {
-		case AST_FRAME_CONTROL:
+		if (f->frametype == AST_FRAME_CONTROL) {
 			if (f->subclass.integer == AST_CONTROL_HANGUP) {
 				/* Continue on in the dialplan */
 				ast_debug(3, "%s: Hangup\n",
 					ast_channel_uniqueid(chan));
-				control_continue(control);
+				break;
 			}
-			break;
-		default:
-			/* Not handled; discard */
-			break;
 		}
 	}
 

Modified: trunk/res/stasis/control.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/stasis/control.h?view=diff&rev=397295&r1=397294&r2=397295
==============================================================================
--- trunk/res/stasis/control.h (original)
+++ trunk/res/stasis/control.h Wed Aug 21 11:00:10 2013
@@ -56,14 +56,6 @@
 void control_wait(struct stasis_app_control *control);
 
 /*!
- * \brief Signals that a control object should finish and exit back to the
- * dialplan.
- *
- * \param control Control object to continue.
- */
-void control_continue(struct stasis_app_control *control);
-
-/*!
  * \brief Returns true if control_continue() has been called on this \a control.
  *
  * \param control Control to query.