kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-26 02:16:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix asterisk setting of pritimers from chan_dahdi.conf

Browse Source 
regression since sig_pri split.

(issue #16909)
Reported by: alecdavis
Patches: 
      pritimer.asterisk.diff.txt uploaded by alecdavis (license 585)
Tested by: alecdavis



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@249759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alec L Davis
2010-03-02 06:56:14 +00:00
parent b4b7d16f6f
commit 5dbe86a3c2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_dahdi.c
+5 -4
View File
@@ -418,9 +418,6 @@ static int mwilevel = 512;
static int dtmfcid_level = 256;
#ifdef HAVE_PRI
#ifdef PRI_GETSET_TIMERS
static int pritimers[PRI_MAX_TIMERS];
#endif
static int pridebugfd = -1;
static char pridebugfilename[1024] = "";
#endif
@@ -11386,6 +11383,10 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf,
ast_copy_string(pris[span].pri.unknownprefix, conf->pri.pri.unknownprefix, sizeof(pris[span].pri.unknownprefix));
pris[span].pri.resetinterval = conf->pri.pri.resetinterval;
for (x = 0; x < PRI_MAX_TIMERS; x++) {
pris[span].pri.pritimers[x] = conf->pri.pri.pritimers[x];
}
if (si.spanno != span + 1) { /* in another trunkgroup */
tmp->prioffset = pris[span].pri.numchans;
} else {
@@ -16399,7 +16400,7 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
"'%s' is not a valid value for ISDN timer '%s' at line %d.\n",
c, timerc, v->lineno);
} else {
pritimers[timeridx] = timer;
confp->pri.pri.pritimers[timeridx] = timer;
}
} else {
ast_log(LOG_WARNING,