Commit backport of fix to DTMF detection during overlap mode

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@6348 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index f7f2969a2a778eead73562bfdb46b853bf096ec5..5e0cec8f55a8135451157e210f4f3cccb11a87b7 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3092,7 +3092,13 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
                        p->pulsedial = 1;
                else
                        p->pulsedial = 0;
-               ast_log(LOG_DEBUG, "Pulse dial '%c'\n", res & 0xff);
+               ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse " : "", res & 0xff);
+#ifdef ZAPATA_PRI
+               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;
+               }
+#endif
                p->subs[index].f.frametype = AST_FRAME_DTMF;
                p->subs[index].f.subclass = res & 0xff;
                /* Unmute conference, return the captured digit */