From 4d3a765560ed8334b10ea850e69b4870c8766211 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Fri, 23 May 2008 21:21:35 +0000 Subject: Fix a few things I missed to ensure zt_chan_conf structure is not modified in mkintf git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@118163 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_zap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 024fb138f..c75670e23 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -7244,13 +7244,13 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc } } #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 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc 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; -- cgit v1.2.3