[Asterisk-cvs] asterisk/channels chan_iax2.c,1.247,1.248

[markster at lists.digium.com]

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

Modified Files:
	chan_iax2.c 
Log Message:
Fix native bridge not to intercept DTMF if it's needed


Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- chan_iax2.c	10 Feb 2005 21:14:11 -0000	1.247
+++ chan_iax2.c	11 Feb 2005 20:07:45 -0000	1.248
@@ -2712,11 +2712,13 @@
 	unsigned short callno0 = PTR_TO_CALLNO(c0->pvt->pvt);
 	unsigned short callno1 = PTR_TO_CALLNO(c1->pvt->pvt);
 	struct timeval waittimer = {0, 0}, tv;
-	
+
 	lock_both(callno0, callno1);
 	/* Put them in native bridge mode */
-	iaxs[callno0]->bridgecallno = callno1;
-	iaxs[callno1]->bridgecallno = callno0;
+	if (!flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) {
+		iaxs[callno0]->bridgecallno = callno1;
+		iaxs[callno1]->bridgecallno = callno0;
+	}
 	unlock_both(callno0, callno1);
 
 	/* If not, try to bridge until we can execute a transfer, if we can */