[svn-commits] mattf: branch 1.4 r1658 - /branches/1.4/ztcfg.c

[svn-commits at lists.digium.com]

Author: mattf
Date: Wed Nov 29 11:31:17 2006
New Revision: 1658

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1658
Log:
Fix for #7860.  Make sure we don't allow channel 16 to be clear if it's in E1/CAS mode.

Modified:
    branches/1.4/ztcfg.c

Modified: branches/1.4/ztcfg.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztcfg.c?view=diff&rev=1658&r1=1657&r2=1658
==============================================================================
--- branches/1.4/ztcfg.c (original)
+++ branches/1.4/ztcfg.c Wed Nov 29 11:31:17 2006
@@ -1394,6 +1394,16 @@
 						current_state.channo = cc[x].chan | ZT_GET_PARAMS_RETURN_MASTER;
 						if (ioctl(fd, ZT_GET_PARAMS, &current_state))
 							needupdate = 1;
+						else if (current_state.chanpos == 16 &&
+							(cc[x].sigtype & ZT_SIG_CLEAR) && 
+							!(lc[current_state.spanno - 1].lineconfig &
+							(ZT_CONFIG_D4|ZT_CONFIG_ESF|ZT_CONFIG_B8ZS|ZT_CONFIG_CCS))) {
+								fprintf(stderr, 
+									"CAS signalling on span %u conflicts with %s on channel %u.\n",
+									current_state.spanno, 
+									sigtype_to_str(cc[x].sigtype), x);
+								exit(1);
+						}
 					}
 					
 					if (!needupdate) {