[Asterisk-cvs] asterisk/channels chan_zap.c,1.487,1.488

[mattf]

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

Modified Files:
	chan_zap.c 
Log Message:
Don't catch digits from zaptel during overlap dialing


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -d -r1.487 -r1.488
--- chan_zap.c	15 Aug 2005 14:57:58 -0000	1.487
+++ chan_zap.c	16 Aug 2005 16:12:22 -0000	1.488
@@ -3350,9 +3350,14 @@
 			p->pulsedial = 1;
 		else
 			p->pulsedial = 0;
-		ast_log(LOG_DEBUG, "Pulse dial '%c'\n", res & 0xff);
-		p->subs[index].f.frametype = AST_FRAME_DTMF;
-		p->subs[index].f.subclass = res & 0xff;
+		ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff);
+		if ((p->proceeding < 2) && p->sig == SIG_PRI && p->pri && p->pri->overlapdial) {
+			p->subs[index].f.frametype = AST_FRAME_NULL;
+			p->subs[index].f.subclass = 0;
+		} else {
+			p->subs[index].f.frametype = AST_FRAME_DTMF;
+			p->subs[index].f.subclass = res & 0xff;
+		}
 		/* Unmute conference, return the captured digit */
 		zt_confmute(p, 0);
 		return &p->subs[index].f;