diff options
| author | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 06:56:14 +0000 |
|---|---|---|
| committer | alecdavis <alecdavis@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-02 06:56:14 +0000 |
| commit | e51972cc68060a308cd5b314760f8519aa7e3966 (patch) | |
| tree | 44bfb6dd3a5c7f1117643e5298f105af661e726d /channels | |
| parent | 55968187edfe940092439c1ae16d2baa9d6efd77 (diff) | |
fix asterisk setting of pritimers from chan_dahdi.conf
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: http://svn.digium.com/svn/asterisk/trunk@249759 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9be24e44f..cd1dbcfc3 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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, |