summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Fredrickson <creslin@digium.com>2005-08-16 16:12:22 +0000
committerMatthew Fredrickson <creslin@digium.com>2005-08-16 16:12:22 +0000
commitd39d277adaa3ad43c084951731a826d89746b18f (patch)
tree0dcd6f89625d43e8ad9e96ec41931f929b69dd8c
parentb353b1d6fb33748bdc0735985d37b700553eddda (diff)
Don't catch digits from zaptel during overlap dialing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-xchannels/chan_zap.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2474c10d6..cb3fbde12 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -3350,9 +3350,14 @@ 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);
- 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;