diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-23 21:26:39 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-23 21:26:39 +0000 |
| commit | 972905a6358c269996d5d7abaa89a4f2d5d350fa (patch) | |
| tree | a3d9385eb2f9dcf6637e178658ea9debed1c2ae3 /channels | |
| parent | 3342d99a3004b5d743c3dc210c5c676321db036e (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@118164 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index a5ce2b32a..b9860f33a 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -8213,13 +8213,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); @@ -8244,9 +8244,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; |