Merged revisions 238134 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r238134 | jpeeler | 2010-01-06 13:05:06 -0600 (Wed, 06 Jan 2010) | 10 lines

  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)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@238136 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index da4b771f4595be5a111c3f988c810a0cdb275fb1..4bfef4e345e512e99ae5a7f6a0d07b55e8cc4447 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -4486,9 +4486,7 @@ static int bridge_exec(struct ast_channel *chan, void *data)
                ast_app_parse_options(bridge_exec_options, &opts, NULL, 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);
                manager_event(EVENT_FLAG_CALL, "BridgeExec",
                                        "Response: Failed\r\n"