kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-20 12:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix feature group d MF

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-05-29 16:03:53 +00:00
parent d6e3f866bc
commit ed04393d27
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
channels/chan_zap.c
View File

@@ -3658,6 +3658,24 @@ char c;
} }
} }
static int zt_wink(struct zt_pvt *p, int index)
{
int j;
zt_set_hook(p->subs[index].zfd, ZT_WINK);
for(;;)
{
/* set bits of interest */
j = ZT_IOMUX_SIGEVENT;
/* wait for some happening */
if (ioctl(p->subs[index].zfd,ZT_IOMUX,&j) == -1) return(-1);
/* exit loop if we have it */
if (j & ZT_IOMUX_SIGEVENT) break;
}
/* get the event info */
if (ioctl(p->subs[index].zfd,ZT_GETEVENT,&j) == -1) return(-1);
return 0;
}
static void *ss_thread(void *data) static void *ss_thread(void *data)
{ {
struct ast_channel *chan = data; struct ast_channel *chan = data;
@@ -3670,7 +3688,7 @@ static void *ss_thread(void *data)
struct callerid_state *cs; struct callerid_state *cs;
char *name=NULL, *number=NULL; char *name=NULL, *number=NULL;
int flags; int flags;
int i,j; int i;
int timeout; int timeout;
int getforward=0; int getforward=0;
char *s1, *s2; char *s1, *s2;
@@ -3696,18 +3714,8 @@ static void *ss_thread(void *data)
case SIG_SF_FEATDMF: case SIG_SF_FEATDMF:
case SIG_SF_FEATB: case SIG_SF_FEATB:
case SIG_SFWINK: case SIG_SFWINK:
zt_set_hook(p->subs[index].zfd, ZT_WINK); if (zt_wink(p, index))
for(;;) return NULL;
{
/* set bits of interest */
j = ZT_IOMUX_SIGEVENT;
/* wait for some happening */
if (ioctl(p->subs[index].zfd,ZT_IOMUX,&j) == -1) return(NULL);
/* exit loop if we have it */
if (j & ZT_IOMUX_SIGEVENT) break;
}
/* get the event info */
if (ioctl(p->subs[index].zfd,ZT_GETEVENT,&j) == -1) return(NULL);
/* Fall through */ /* Fall through */
case SIG_EM: case SIG_EM:
case SIG_SF: case SIG_SF:
@@ -3822,6 +3830,9 @@ static void *ss_thread(void *data)
} else } else
ast_log(LOG_WARNING, "Got a non-Feature Group B input on channel %d. Assuming E&M Wink instead\n", p->channel); ast_log(LOG_WARNING, "Got a non-Feature Group B input on channel %d. Assuming E&M Wink instead\n", p->channel);
} }
if (p->sig == SIG_FEATDMF) {
zt_wink(p, index);
}
zt_enable_ec(p); zt_enable_ec(p);
if (ast_exists_extension(chan, chan->context, exten, 1, chan->callerid)) { if (ast_exists_extension(chan, chan->context, exten, 1, chan->callerid)) {
strncpy(chan->exten, exten, sizeof(chan->exten)-1); strncpy(chan->exten, exten, sizeof(chan->exten)-1);