[asterisk-commits] jpeeler: branch 1.4 r118163 - /branches/1.4/channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Fri May 23 16:21:35 2008
New Revision: 118163

URL: http://svn.digium.com/view/asterisk?view=rev&rev=118163
Log:
Fix a few things I missed to ensure zt_chan_conf structure is not modified in mkintf

Modified:
    branches/1.4/channels/chan_zap.c

Modified: branches/1.4/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_zap.c?view=diff&rev=118163&r1=118162&r2=118163
==============================================================================
--- branches/1.4/channels/chan_zap.c (original)
+++ branches/1.4/channels/chan_zap.c Fri May 23 16:21:35 2008
@@ -7244,13 +7244,13 @@
 				}
 			}
 #ifdef HAVE_PRI
-			if ((conf->chan.sig == SIG_PRI) || (conf->chan.sig == SIG_GR303FXOKS) || (conf->chan.sig == SIG_GR303FXSKS)) {
+			if ((chan_sig == SIG_PRI) || (chan_sig == SIG_GR303FXOKS) || (chan_sig == SIG_GR303FXSKS)) {
 				int offset;
 				int myswitchtype;
 				int matchesdchan;
 				int x,y;
 				offset = 0;
-				if ((conf->chan.sig == SIG_PRI) && ioctl(tmp->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &offset)) {
+				if ((chan_sig == SIG_PRI) && ioctl(tmp->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &offset)) {
 					ast_log(LOG_ERROR, "Unable to set clear mode on clear channel %d of span %d: %s\n", channel, p.spanno, strerror(errno));
 					destroy_zt_pvt(&tmp);
 					return NULL;
@@ -7274,7 +7274,7 @@
 						destroy_zt_pvt(&tmp);
 						return NULL;
 					}
-					if (conf->chan.sig == SIG_PRI)
+					if (chan_sig == SIG_PRI)
 						myswitchtype = conf->pri.switchtype;
 					else
 						myswitchtype = PRI_SWITCH_GR303_TMC;