[svn-commits] jpeeler: trunk r238134 - /trunk/main/features.c

SVN commits to the Digium repositories svn-commits at lists.digium.com
Wed Jan 6 13:05:11 CST 2010


Author: jpeeler
Date: Wed Jan  6 13:05:06 2010
New Revision: 238134

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=238134
Log:
Fix channel name comparison for bridge application.

The channel name comparison was not comparing the whole string and therefore
if one channel name was a substring of the other, the bridge would fail.

(closes issue #16528)
Reported by: telecos82
Patches: 
      res_features_r236843.diff uploaded by telecos82 (license 687)

Modified:
    trunk/main/features.c

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=238134&r1=238133&r2=238134
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Jan  6 13:05:06 2010
@@ -4975,9 +4975,7 @@
 		ast_app_parse_options(bridge_exec_options, &opts, opt_args, args.options);
 
 	/* avoid bridge with ourselves */
-	if (!strncmp(chan->name, args.dest_chan, 
-		strlen(chan->name) < strlen(args.dest_chan) ? 
-		strlen(chan->name) : strlen(args.dest_chan))) {
+	if (!strcmp(chan->name, args.dest_chan)) {
 		ast_log(LOG_WARNING, "Unable to bridge channel %s with itself\n", chan->name);
 		ast_manager_event(chan, EVENT_FLAG_CALL, "BridgeExec",
 					"Response: Failed\r\n"




More information about the svn-commits mailing list