[asterisk-commits] file: branch 1.2 r56230 - in /branches/1.2: channel.c channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Thu Feb 22 12:44:24 2007
New Revision: 56230

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56230
Log:
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.

Modified:
    branches/1.2/channel.c
    branches/1.2/channels/chan_sip.c

Modified: branches/1.2/channel.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channel.c?view=diff&rev=56230&r1=56229&r2=56230
==============================================================================
--- branches/1.2/channel.c (original)
+++ branches/1.2/channel.c Thu Feb 22 12:44:24 2007
@@ -2807,10 +2807,10 @@
 
 	/* 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)) {

Modified: branches/1.2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/chan_sip.c?view=diff&rev=56230&r1=56229&r2=56230
==============================================================================
--- branches/1.2/channels/chan_sip.c (original)
+++ branches/1.2/channels/chan_sip.c Thu Feb 22 12:44:24 2007
@@ -10458,7 +10458,7 @@
 	bridgea = ast_bridged_channel(chana);
 	bridgeb = ast_bridged_channel(chanb);
 	
-	if (bridgea && (bridgea == chana->_bridge)) {
+	if (bridgea) {
 		peera = chana;
 		peerb = chanb;
 		peerc = bridgea;