From afc99294fa6a3bb8f448f80656c9ae41db5bcf82 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Thu, 22 Feb 2007 18:53:22 +0000
Subject: [PATCH] Merged revisions 56231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r56231 | file | 2007-02-22 13:49:39 -0500 (Thu, 22 Feb 2007) | 10 lines
Merged revisions 56230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r56230 | file | 2007-02-22 13:44:24 -0500 (Thu, 22 Feb 2007) | 2 lines
Only change the original or clone channel if it's the channel behind the proxy channel, not if it's just a regular bridged channel.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@56232 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 2 +-
main/channel.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f91f5ca665..d477a172b6 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13404,7 +13404,7 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
ast_log(LOG_DEBUG, "-- No target second channel ---\n");
ast_log(LOG_DEBUG, "-- END Sip transfer:--------------------\n");
}
- if (transferer->chan2 && (ast_bridged_channel(transferer->chan2) == transferer->chan2->_bridge)) { /* We have a bridge on the transferer's channel */
+ if (transferer->chan2) { /* We have a bridge on the transferer's channel */
peera = transferer->chan1; /* Transferer - PBX -> transferee channel * the one we hangup */
peerb = target->chan1; /* Transferer - PBX -> target channel - This will get lost in masq */
peerc = transferer->chan2; /* Asterisk to Transferee */
diff --git a/main/channel.c b/main/channel.c
index 0405a7ab5a..2ab07b7e52 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3114,10 +3114,10 @@ int ast_channel_masquerade(struct ast_channel *original, struct ast_channel *clo
/* each of these channels may be sitting behind a channel proxy (i.e. chan_agent)
and if so, we don't really want to masquerade it, but its proxy */
- if (original->_bridge && (original->_bridge != ast_bridged_channel(original)))
+ if (original->_bridge && (original->_bridge != ast_bridged_channel(original)) && (original->_bridge->_bridge != original))
final_orig = original->_bridge;
- if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)))
+ if (clone->_bridge && (clone->_bridge != ast_bridged_channel(clone)) && (clone->_bridge->_bridge != clone))
final_clone = clone->_bridge;
if ((final_orig != original) || (final_clone != clone)) {
--
GitLab