diff options
| author | Matthew Fredrickson <creslin@digium.com> | 2008-05-11 03:23:05 +0000 |
|---|---|---|
| committer | Matthew Fredrickson <creslin@digium.com> | 2008-05-11 03:23:05 +0000 |
| commit | 5e3d36e4aaf9c94917a8a0ed16ee9f0b140dcf51 (patch) | |
| tree | ef38147193d9186197ce09287d552d5117dd1bbb /channels/chan_zap.c | |
| parent | 1a492c49d4ab83b823d78b9b20cc75a4bae55052 (diff) | |
Add Zap MTP2 support to chan_zap
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index d134f6903..81166eeee 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9315,7 +9315,7 @@ static void *ss7_linkset(void *data) for (i = 0; i < linkset->numsigchans; i++) { pollers[i].fd = linkset->fds[i]; - pollers[i].events = POLLIN | POLLOUT | POLLPRI; + pollers[i].events = ss7_pollflags(ss7, linkset->fds[i]); pollers[i].revents = 0; } @@ -12849,7 +12849,11 @@ static int linkset_addsigchan(int sigchan) ast_log(LOG_ERROR, "Unable to get parameters for sigchan %d (%s)\n", sigchan, strerror(errno)); return -1; } - if ((p.sigtype != ZT_SIG_HDLCFCS) && (p.sigtype != ZT_SIG_HARDHDLC)) { + if ((p.sigtype != ZT_SIG_HDLCFCS) && (p.sigtype != ZT_SIG_HARDHDLC) +#if defined(HAVE_ZAPTEL_SIG_MTP2) + && (p.sigtype != ZT_SIG_MTP2) +#endif + ) { zt_close(link->fds[curfd]); link->fds[curfd] = -1; ast_log(LOG_ERROR, "sigchan %d is not in HDLC/FCS mode. See /etc/zaptel.conf\n", sigchan); |