aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-06 19:07:03 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-06 19:07:03 +0000
commit3131882dd85e619659c838e2620c5806304b00a7 (patch)
treedee0cd6d76abc866c094849a9fa42565f66fcf7a
parent9ad967cb1eb9a4c97897e4c64a101491f78be107 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@238135 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/features.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/main/features.c b/main/features.c
index 58ee55c1e..283c1805f 100644
--- a/main/features.c
+++ b/main/features.c
@@ -3954,9 +3954,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"