From b6bd3b483ef6a9bdb52ac6c06ff4d92dff1e66a8 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 19 Jun 2007 16:24:31 +0000 Subject: [PATCH] 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/branches/1.4@69987 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/main/channel.c b/main/channel.c index 7fd58eca95..d3cbab4f0e 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4162,7 +4162,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) &&