[Asterisk-cvs] asterisk/channels chan_zap.c,1.171.2.18,1.171.2.19

[markster at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	chan_zap.c 
Log Message:
Backport fix for BRI connections to -stable.


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.171.2.18
retrieving revision 1.171.2.19
diff -u -d -r1.171.2.18 -r1.171.2.19
--- chan_zap.c	22 Mar 2004 22:49:23 -0000	1.171.2.18
+++ chan_zap.c	13 Apr 2004 21:47:26 -0000	1.171.2.19
@@ -3644,6 +3644,11 @@
 					f = NULL;
 				}
 			} else if (f->frametype == AST_FRAME_DTMF) {
+				if (!p->proceeding && p->sig==SIG_PRI && p->pri && p->pri->overlapdial) {
+					/* Don't accept in-band DTMF when in overlap dial mode */
+					f->frametype = AST_FRAME_NULL;
+					f->subclass = 0;
+				}
 				/* DSP clears us of being pulse */
 				p->pulsedial = 0;
 			}