[asterisk-commits] dlee: branch dlee/ASTERISK-21969 r397806 - in /team/dlee/ASTERISK-21969: ./ res/

[SVN commits to the Asterisk project]

Author: dlee
Date: Tue Aug 27 13:47:23 2013
New Revision: 397806

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397806
Log:
Allow channels in app_stasis to hangup properly

This detects hangups that occur while bridged to allow channels to exit
app_stasis even if the hangup frame was absorbed by the bridge the
channel was in.

Reported by: David Lee
(closes issue ASTERISK-22297)
........

Merged revisions 397244 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/dlee/ASTERISK-21969/   (props changed)
    team/dlee/ASTERISK-21969/res/res_stasis.c

Propchange: team/dlee/ASTERISK-21969/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 27 13:47:23 2013
@@ -1,1 +1,1 @@
-/trunk:1-397243
+/trunk:1-397244

Modified: team/dlee/ASTERISK-21969/res/res_stasis.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/ASTERISK-21969/res/res_stasis.c?view=diff&rev=397806&r1=397805&r2=397806
==============================================================================
--- team/dlee/ASTERISK-21969/res/res_stasis.c (original)
+++ team/dlee/ASTERISK-21969/res/res_stasis.c Tue Aug 27 13:47:23 2013
@@ -403,6 +403,11 @@
 		int command_count;
 		struct ast_bridge *last_bridge = NULL;
 		struct ast_bridge *bridge = NULL;
+
+		/* Check to see if a bridge absorbed our hangup frame */
+		if (ast_check_hangup_locked(chan)) {
+			break;
+		}
 
 		last_bridge = bridge;
 		bridge = stasis_app_get_bridge(control);