From 3fc2609468e351c0f3c311425554b7e657b3c202 Mon Sep 17 00:00:00 2001
From: Mark Spencer <markster@digium.com>
Date: Wed, 15 Sep 2004 22:06:30 +0000
Subject: [PATCH] Fix app_disa to not ignore ignorepat :) (bug #2451)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_disa.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 4d91673506..03f13c67c4 100755
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -104,7 +104,7 @@ static void play_dialtone(struct ast_channel *chan)
static int disa_exec(struct ast_channel *chan, void *data)
{
- int i,j,k,x;
+ int i,j,k,x,did_ignore;
struct localuser *u;
char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
char *ourcontext,*ourcallerid;
@@ -152,6 +152,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
ast_answer(chan);
}
i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */
+ did_ignore = 0;
exten[0] = 0;
acctcode[0] = 0;
/* can we access DISA without password? */
@@ -276,11 +277,21 @@ static int disa_exec(struct ast_channel *chan, void *data)
continue;
}
}
+
exten[i++] = j; /* save digit */
exten[i] = 0;
if (!k) continue; /* if getting password, continue doing it */
/* if this exists */
+ if (ast_ignore_pattern(ourcontext, exten)) {
+ play_dialtone(chan);
+ did_ignore = 1;
+ } else
+ if (did_ignore) {
+ ast_playtones_stop(chan);
+ did_ignore = 0;
+ }
+
/* if can do some more, do it */
if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->callerid)) {
break;
--
GitLab