kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 16:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few things I missed to ensure zt_chan_conf structure is not modified in mkintf

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@118163 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2008-05-23 21:21:35 +00:00
parent 3fcdfbf20f
commit ac177d4459
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_zap.c
View File

@@ -7244,13 +7244,13 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc
} }
} }
#ifdef HAVE_PRI #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 offset;
int myswitchtype; int myswitchtype;
int matchesdchan; int matchesdchan;
int x,y; int x,y;
offset = 0; 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)); 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); destroy_zt_pvt(&tmp);
return NULL; return NULL;
@@ -7274,7 +7274,7 @@ static struct zt_pvt *mkintf(int channel, const struct zt_chan_conf *conf, struc
destroy_zt_pvt(&tmp); destroy_zt_pvt(&tmp);
return NULL; return NULL;
} }
if (conf->chan.sig == SIG_PRI) if (chan_sig == SIG_PRI)
myswitchtype = conf->pri.switchtype; myswitchtype = conf->pri.switchtype;
else else
myswitchtype = PRI_SWITCH_GR303_TMC; myswitchtype = PRI_SWITCH_GR303_TMC;