[svn-commits] trunk r37223 - /trunk/channel.c

[svn-commits at lists.digium.com]

Author: mogorman
Date: Thu Jul  6 16:36:17 2006
New Revision: 37223

URL: http://svn.digium.com/view/asterisk?rev=37223&view=rev
Log:
patch resolves issue with when to decide if its right time 
to native bridge, feature redirect was not being checked.
patch from bug #7296

Modified:
    trunk/channel.c

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=37223&r1=37222&r2=37223&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Thu Jul  6 16:36:17 2006
@@ -3593,7 +3593,8 @@
 		    (config->timelimit == 0) &&
 		    (c0->tech->bridge == c1->tech->bridge) &&
 		    !nativefailed && !c0->monitor && !c1->monitor &&
-		    !c0->spies && !c1->spies) {
+		    !c0->spies && !c1->spies && !ast_test_flag(&(config->features_callee),AST_FEATURE_REDIRECT) &&
+		    !ast_test_flag(&(config->features_caller),AST_FEATURE_REDIRECT) ) {
 			/* Looks like they share a bridge method and nothing else is in the way */
 			ast_set_flag(c0, AST_FLAG_NBRIDGE);
 			ast_set_flag(c1, AST_FLAG_NBRIDGE);