diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 18:53:22 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-22 18:53:22 +0000 |
| commit | 34a5d7b0212beb3f6bd643e3bd1cff08ee281a1b (patch) | |
| tree | 918c2dabd8d1f52dbb7b78a1e03c6990b38c3859 /channels | |
| parent | 8a8708c9464bfe85e43459cca200425a3d4bdff5 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@56232 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index f91f5ca66..d477a172b 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 */ |