kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-24 13:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix app_disa to not ignore ignorepat :) (bug #2451)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-09-15 22:06:30 +00:00
parent 0eec8c8318
commit 3fc2609468
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_disa.c
View File

@@ -104,7 +104,7 @@ static void play_dialtone(struct ast_channel *chan)
static int disa_exec(struct ast_channel *chan, void *data) 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; struct localuser *u;
char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]=""; char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
char *ourcontext,*ourcallerid; char *ourcontext,*ourcallerid;
@@ -152,6 +152,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
ast_answer(chan); ast_answer(chan);
} }
i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */ i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */
did_ignore = 0;
exten[0] = 0; exten[0] = 0;
acctcode[0] = 0; acctcode[0] = 0;
/* can we access DISA without password? */ /* can we access DISA without password? */
@@ -276,11 +277,21 @@ static int disa_exec(struct ast_channel *chan, void *data)
continue; continue;
} }
} }
exten[i++] = j; /* save digit */ exten[i++] = j; /* save digit */
exten[i] = 0; exten[i] = 0;
if (!k) continue; /* if getting password, continue doing it */ if (!k) continue; /* if getting password, continue doing it */
/* if this exists */ /* 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 can do some more, do it */
if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->callerid)) { if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->callerid)) {
break; break;