[Asterisk-cvs] asterisk/channels chan_sip.c,1.510.2.15,1.510.2.16

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	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.510.2.15
retrieving revision 1.510.2.16
diff -u -d -r1.510.2.15 -r1.510.2.16
--- chan_sip.c	9 Nov 2004 05:23:56 -0000	1.510.2.15
+++ chan_sip.c	9 Nov 2004 05:28:47 -0000	1.510.2.16
@@ -7027,7 +7027,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");
@@ -7042,16 +7043,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);