diff options
| author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-11 03:27:05 +0000 |
|---|---|---|
| committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-11 03:27:05 +0000 |
| commit | aea8e14fbd9e51adf67e8a890f7b9d931d41cefc (patch) | |
| tree | 4bb546617ca53811c7ccdd29c3bfccab2bf9775b /channels | |
| parent | 7354663d87118634f9dcb759d0d576191cabe577 (diff) | |
Merged revisions 115600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r115600 | mattf | 2008-05-10 22:23:05 -0500 (Sat, 10 May 2008) | 1 line
Add Zap MTP2 support to chan_zap
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115601 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 ece96b70d..6b5e177f1 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9308,7 +9308,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; } @@ -12826,7 +12826,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); |