[Asterisk-cvs] asterisk/channels chan_sip.c,1.554,1.555

[markster at lists.digium.com]

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

Modified Files:
	chan_sip.c 
Log Message:
Fix supervised transfer (bug #2813)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.554
retrieving revision 1.555
diff -u -d -r1.554 -r1.555
--- chan_sip.c	8 Nov 2004 15:05:53 -0000	1.554
+++ chan_sip.c	8 Nov 2004 18:23:01 -0000	1.555
@@ -6994,7 +6994,8 @@
 		*bridgeb = NULL,
 		*peera = NULL,
 		*peerb = NULL,
-		*peerc = NULL;
+		*peerc = NULL,
+		*peerd = NULL;
 
 	if (!p1->owner || !p2->owner) {
 		ast_log(LOG_WARNING, "Transfer attempted without dual ownership?\n");
@@ -7009,16 +7010,19 @@
 		peera = chana;
 		peerb = chanb;
 		peerc = bridgea;
+		peerd = bridgeb;
 	} else if (bridgeb) {
 		peera = chanb;
 		peerb = chana;
 		peerc = bridgeb;
+		peerd = bridgea;
 	}
 	
 	if (peera && peerb && peerc) {
 		ast_quiet_chan(peera);
 		ast_quiet_chan(peerb);
 		ast_quiet_chan(peerc);
+		ast_quiet_chan(peerd);
 
 		if (peera->cdr && peerb->cdr) {
 			peerb->cdr = ast_cdr_append(peerb->cdr, peera->cdr);