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

[SVN commits to the Digium repositories]

Author: mattf
Date: Sat Sep 15 15:40:49 2007
New Revision: 3041

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3041
Log:
Remove silly CAS signalling conflicts... patch

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=3041&r1=3040&r2=3041
==============================================================================
--- branches/1.4/ztcfg.c (original)
+++ branches/1.4/ztcfg.c Sat Sep 15 15:40:49 2007
@@ -1397,16 +1397,6 @@
 						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) {