From 13616f1b68399d4b5cb7e5ba69ba6bbc0b5b3737 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Fri, 23 May 2008 21:31:59 +0000 Subject: [PATCH] Merged revisions 118164 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r118164 | jpeeler | 2008-05-23 16:26:39 -0500 (Fri, 23 May 2008) | 9 lines Merged revisions 118163 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r118163 | jpeeler | 2008-05-23 16:21:35 -0500 (Fri, 23 May 2008) | 1 line Fix a few things I missed to ensure zt_chan_conf structure is not modified in mkintf ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@118165 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 9767b89137..f96ecc0b17 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -8207,13 +8207,13 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc } #endif #ifdef HAVE_PRI - if ((conf->chan.sig == SIG_PRI) || (conf->chan.sig == SIG_BRI) || (conf->chan.sig == SIG_BRI_PTMP) || (conf->chan.sig == SIG_GR303FXOKS) || (conf->chan.sig == SIG_GR303FXSKS)) { + if ((chan_sig == SIG_PRI) || (chan_sig == SIG_BRI) || (chan_sig == SIG_BRI_PTMP) || (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) || (conf->chan.sig == SIG_BRI) || (conf->chan.sig == SIG_BRI_PTMP)) + if (((chan_sig == SIG_PRI) || (chan_sig == SIG_BRI) || (chan_sig == SIG_BRI_PTMP)) && 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); @@ -8238,9 +8238,9 @@ 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) || - (conf->chan.sig == SIG_BRI) || - (conf->chan.sig == SIG_BRI_PTMP)) + if ((chan_sig == SIG_PRI) || + (chan_sig == SIG_BRI) || + (chan_sig == SIG_BRI_PTMP)) myswitchtype = conf->pri.switchtype; else myswitchtype = PRI_SWITCH_GR303_TMC;