[Asterisk-cvs] asterisk/channels chan_sip.c,1.634,1.635

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv7395/channels

Modified Files:
	chan_sip.c 
Log Message:
Don't even attempt to masquerade a channel into itself (bug #3040)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -d -r1.634 -r1.635
--- chan_sip.c	16 Jan 2005 07:22:34 -0000	1.634
+++ chan_sip.c	16 Jan 2005 08:10:12 -0000	1.635
@@ -7489,7 +7489,7 @@
 		peerd = bridgea;
 	}
 	
-	if (peera && peerb && peerc) {
+	if (peera && peerb && peerc && (peerb != peerc)) {
 		ast_quiet_chan(peera);
 		ast_quiet_chan(peerb);
 		ast_quiet_chan(peerc);
@@ -7515,7 +7515,7 @@
 		}
 		return res;
 	} else {
-		ast_log(LOG_NOTICE, "Transfer attempted with no bridged calls to transfer\n");
+		ast_log(LOG_NOTICE, "Transfer attempted with no appropriate bridged calls to transfer\n");
 		if (chana)
 			ast_softhangup_nolock(chana, AST_SOFTHANGUP_DEV);
 		if (chanb)