[asterisk-commits] file: branch file/bridging-phase2 r179020 - /team/file/bridging-phase2/main/

[SVN commits to the Asterisk project]

Author: file
Date: Fri Feb 27 08:29:58 2009
New Revision: 179020

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179020
Log:
Fix an issue where it would be possible for a native bridge technology to be used for non-native purposes.

Modified:
    team/file/bridging-phase2/main/bridging.c

Modified: team/file/bridging-phase2/main/bridging.c
URL: http://svn.digium.com/svn-view/asterisk/team/file/bridging-phase2/main/bridging.c?view=diff&rev=179020&r1=179019&r2=179020
==============================================================================
--- team/file/bridging-phase2/main/bridging.c (original)
+++ team/file/bridging-phase2/main/bridging.c Fri Feb 27 08:29:58 2009
@@ -456,9 +456,13 @@
 			ast_debug(1, "Bridge technology %s does not have the capabilities we need.\n", current->name);
 			continue;
 		}
-		if (bridge && (current->capabilities & AST_BRIDGE_CAPABILITY_NATIVE) && (capabilities & AST_BRIDGE_CAPABILITY_NATIVE) && native_bridge_technology_test(current, bridge)) {
-			best = current;
-			break;
+		if ((current->capabilities & AST_BRIDGE_CAPABILITY_NATIVE)) {
+			if (bridge && (capabilities & AST_BRIDGE_CAPABILITY_NATIVE) && native_bridge_technology_test(current, bridge)) {
+				best = current;
+				break;
+			}
+			ast_debug(1, "Bridge technology %s is for native bridging but we can't use it.\n", current->name);
+			continue;
 		}
 		if (best && best->preference < current->preference) {
 			ast_debug(1, "Bridge technology %s has preference %d while %s has preference %d. Skipping.\n", current->name, current->preference, best->name, best->preference);