From: Joshua Colp <jcolp@digium.com>
Date: Tue, 19 Jun 2007 16:25:57 +0000 (+0000)
Subject: Merged revisions 69987 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2336
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afe63aec3378c52bcbd5cde851c61ef9f3abcd8c;p=thirdparty%2Fasterisk.git

Merged revisions 69987 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r69987 | file | 2007-06-19 12:24:31 -0400 (Tue, 19 Jun 2007) | 10 lines

Merged revisions 69986 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r69986 | file | 2007-06-19 12:21:29 -0400 (Tue, 19 Jun 2007) | 2 lines

Update BRIDGEPEER variable if set to the new channel name when a masquerade happens. (issue #9699 reported by dimas)

........

................


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

diff --git a/main/channel.c b/main/channel.c
index 1e3c3ec9ae..4d6533d363 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -4088,7 +4088,13 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
 				ast_check_hangup(c1) ? "Yes" : "No");
 			break;
 		}
-
+		
+		/* See if the BRIDGEPEER variable needs to be updated */
+		if (!ast_strlen_zero(pbx_builtin_getvar_helper(c0, "BRIDGEPEER")))
+			pbx_builtin_setvar_helper(c0, "BRIDGEPEER", c1->name);
+		if (!ast_strlen_zero(pbx_builtin_getvar_helper(c1, "BRIDGEPEER")))
+			pbx_builtin_setvar_helper(c1, "BRIDGEPEER", c0->name);
+		
 		if (c0->tech->bridge &&
 		    (config->timelimit == 0) &&
 		    (c0->tech->bridge == c1->tech->bridge) &&