From c966ea6e2d75e06d8e30dab6baab06b97aa5802d Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 22 Feb 2007 18:44:24 +0000 Subject: [PATCH] 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/branches/1.2@56230 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 4 ++-- channels/chan_sip.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/channel.c b/channel.c index 577d0c799d..82758b3d47 100644 --- a/channel.c +++ b/channel.c @@ -2807,10 +2807,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)) { diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 594f5e6a9b..2ce4d2574d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10458,7 +10458,7 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2) bridgea = ast_bridged_channel(chana); bridgeb = ast_bridged_channel(chanb); - if (bridgea && (bridgea == chana->_bridge)) { + if (bridgea) { peera = chana; peerb = chanb; peerc = bridgea;