[asterisk-commits] branch 1.2 r37224 - /branches/1.2/channel.c

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Thu Jul  6 16:41:23 2006
New Revision: 37224

URL: http://svn.digium.com/view/asterisk?rev=37224&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:
    branches/1.2/channel.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?rev=37224&r1=37223&r2=37224&view=diff
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Thu Jul  6 16:41:23 2006
@@ -3483,7 +3483,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 */
 			if (option_verbose > 2) 
 				ast_verbose(VERBOSE_PREFIX_3 "Attempting native bridge of %s and %s\n", c0->name, c1->name);