sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow zapscan to select a specific channel (bug 1371) 

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich 2004-04-10 02:49:06 +00:00
parent fcf76b36aa
commit ae07b8ee83
1 changed files with 71 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
apps/app_zapscan.c
View File

@ -54,6 +54,24 @@ LOCAL_USER_DECL;
#define CONF_SIZE 160 #define CONF_SIZE 160
static struct ast_channel *get_zap_channel(int num) {
struct ast_channel *c=NULL;
char name[80];
snprintf(name,sizeof(name),"Zap/%d-1",num);
c = ast_channel_walk(NULL);
while(c) {
if (!strcasecmp(c->name, name)) {
break;
}
c = ast_channel_walk(c);
}
if (c)
return c;
return NULL;
}
static int careful_write(int fd, unsigned char *data, int len) static int careful_write(int fd, unsigned char *data, int len)
{ {
int res; int res;
@ -87,6 +105,8 @@ static int conf_run(struct ast_channel *chan, int confno, int confflags)
int retryzap; int retryzap;
int origfd; int origfd;
int ret = -1; int ret = -1;
char input[4];
int ic=0;
ZT_BUFFERINFO bi; ZT_BUFFERINFO bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
@ -188,14 +208,30 @@ zapretry:
f = ast_read(c); f = ast_read(c);
if (!f) if (!f)
break; break;
if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#')) { if(f->frametype == AST_FRAME_DTMF) {
ret = 0; if(f->subclass == '#') {
ret = 0;
break; break;
} else if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*')) { }
ret = -1; else if (f->subclass == '*') {
break; ret = -1;
} else if (fd != chan->fds[0]) { break;
if (f->frametype == AST_FRAME_VOICE) {
}
else {
input[ic++] = f->subclass;
}
if(ic == 3) {
input[ic++] = '\0';
ic=0;
ret = atoi(input);
ast_verbose(VERBOSE_PREFIX_3 "Zapscan: change channel to %d\n",ret);
break;
}
}
if (fd != chan->fds[0]) {
if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_ULAW) { if (f->subclass == AST_FORMAT_ULAW) {
/* Carefully write */ /* Carefully write */
careful_write(fd, f->data, f->datalen); careful_write(fd, f->data, f->datalen);
@ -247,9 +283,10 @@ static int conf_exec(struct ast_channel *chan, void *data)
int confflags = 0; int confflags = 0;
int confno = 0; int confno = 0;
char confstr[80], *tmp; char confstr[80], *tmp;
struct ast_channel *tempchan = NULL, *lastchan = NULL; struct ast_channel *tempchan = NULL, *lastchan = NULL,*ichan = NULL;
struct ast_frame *f; struct ast_frame *f;
int input=0;
LOCAL_USER_ADD(u); LOCAL_USER_ADD(u);
if (chan->_state != AST_STATE_UP) if (chan->_state != AST_STATE_UP)
@ -266,22 +303,31 @@ static int conf_exec(struct ast_channel *chan, void *data)
break; break;
} }
ast_frfree(f); ast_frfree(f);
tempchan = ast_channel_walk(tempchan); ichan = NULL;
if ( !tempchan && !lastchan ) if(input) {
break; ichan = get_zap_channel(input);
if ( tempchan && tempchan->type && (!strcmp(tempchan->type, "Zap")) && (tempchan != chan) ) { input = 0;
ast_verbose(VERBOSE_PREFIX_3 "Zap channel %s is in-use, monitoring...\n", tempchan->name); }
strcpy(confstr, tempchan->name);
if ((tmp = strchr(confstr,'-'))) { tempchan = ichan ? ichan : ast_channel_walk(tempchan);
*tmp = '\0';
if ( !tempchan && !lastchan )
break;
if ( tempchan && tempchan->type && (!strcmp(tempchan->type, "Zap")) && (tempchan != chan) ) {
ast_verbose(VERBOSE_PREFIX_3 "Zap channel %s is in-use, monitoring...\n", tempchan->name);
strcpy(confstr, tempchan->name);
if ((tmp = strchr(confstr,'-'))) {
*tmp = '\0';
} }
confno = atoi(strchr(confstr,'/') + 1); confno = atoi(strchr(confstr,'/') + 1);
ast_stopstream(chan); ast_stopstream(chan);
ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language); ast_say_number(chan, confno, AST_DIGIT_ANY, chan->language);
res = conf_run(chan, confno, confflags); res = conf_run(chan, confno, confflags);
if (res<0) break; if (res<0) break;
} input = res;
lastchan = tempchan; }
lastchan = tempchan;
} }
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);