[svn-commits] mattf: branch 1.6.0 r115601 - in /branches/1.6.0: ./ channels/ include/asterisk/

[SVN commits to the Digium repositories]

Author: mattf
Date: Sat May 10 22:27:05 2008
New Revision: 115601

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115601
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_zap.c
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_zap.c?view=diff&rev=115601&r1=115600&r2=115601
==============================================================================
--- branches/1.6.0/channels/chan_zap.c (original)
+++ branches/1.6.0/channels/chan_zap.c Sat May 10 22:27:05 2008
@@ -9308,7 +9308,7 @@
 
 		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 @@
 			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);

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=115601&r1=115600&r2=115601
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Sat May 10 22:27:05 2008
@@ -1289,7 +1289,7 @@
 
 AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
 
-AST_EXT_LIB_CHECK([SS7], [ss7], [isup_set_generic_name], [libss7.h])
+AST_EXT_LIB_CHECK([SS7], [ss7], [ss7_pollflags], [libss7.h])
 
 if test "${USE_PWLIB}" != "no"; then
 	if test -n "${PWLIB_DIR}"; then
@@ -1484,6 +1484,9 @@
 # Check for channel alarm support
 AST_C_COMPILE_CHECK([ZAPTEL_CHANALARMS], [size_t foo = sizeof(struct zt_params_v1)], [zaptel/zaptel.h])
 
+# Check for ZT_SIG_MTP2
+AST_C_DEFINE_CHECK([ZAPTEL_SIG_MTP2], [ZT_SIG_MTP2], [zaptel/zaptel.h])
+
 # On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf
 case "${host_os}" in
     freebsd*)

Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=115601&r1=115600&r2=115601
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Sat May 10 22:27:05 2008
@@ -1058,6 +1058,12 @@
 
 /* Define ZAPTEL_NEONMWI headers version */
 #undef HAVE_ZAPTEL_NEONMWI_VERSION
+
+/* Define if your system has the ZAPTEL_SIG_MTP2 headers. */
+#undef HAVE_ZAPTEL_SIG_MTP2
+
+/* Define ZAPTEL_SIG_MTP2 headers version */
+#undef HAVE_ZAPTEL_SIG_MTP2_VERSION
 
 /* Define if your system has the ZAPTEL_TRANSCODE headers. */
 #undef HAVE_ZAPTEL_TRANSCODE