[svn-commits] alecdavis: trunk r249759 - /trunk/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: alecdavis
Date: Tue Mar  2 00:56:14 2010
New Revision: 249759

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249759
Log:
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


Modified:
    trunk/channels/chan_dahdi.c

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=249759&r1=249758&r2=249759
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Tue Mar  2 00:56:14 2010
@@ -418,9 +418,6 @@
 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
@@ -11385,6 +11382,10 @@
 						ast_copy_string(pris[span].pri.privateprefix, conf->pri.pri.privateprefix, sizeof(pris[span].pri.privateprefix));
 						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;
@@ -16399,7 +16400,7 @@
 							"'%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,