[asterisk-commits] qwell: trunk r84432 - in /trunk: ./ res/res_features.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Oct  2 13:59:39 2007
New Revision: 84432

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84432
Log:
Merged revisions 84410 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10821)
........
r84410 | qwell | 2007-10-02 13:52:55 -0500 (Tue, 02 Oct 2007) | 4 lines

Finish up on transferee channel before return on failure.

Issue 10821, patch by Ivan

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

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

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=84432&r1=84431&r2=84432
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Oct  2 13:59:39 2007
@@ -956,8 +956,11 @@
 			return FEATURE_RETURN_SUCCESS;
 		}
 
-		if (check_compat(transferer, newchan))
+		if (check_compat(transferer, newchan)) {
+			/* we do mean transferee here, NOT transferer */
+			finishup(transferee);
 			return -1;
+		}
 		memset(&bconfig,0,sizeof(struct ast_bridge_config));
 		ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT);
 		ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT);
@@ -970,8 +973,10 @@
 			transferer->_softhangup = 0;
 			return FEATURE_RETURN_SUCCESS;
 		}
-		if (check_compat(transferee, newchan))
+		if (check_compat(transferee, newchan)) {
+			finishup(transferee);
 			return -1;
+		}
 		ast_indicate(transferee, AST_CONTROL_UNHOLD);
 
 		if ((ast_autoservice_stop(transferee) < 0)
@@ -1061,8 +1066,10 @@
 			return -1;
 
 		/* newchan is up, we should prepare transferee and bridge them */
-		if (check_compat(transferee, newchan))
+		if (check_compat(transferee, newchan)) {
+			finishup(transferee);
 			return -1;
+		}
 		ast_indicate(transferee, AST_CONTROL_UNHOLD);
 
 		if ((ast_waitfordigit(transferee, 100) < 0)