Author: rmudgett
Date: Fri Dec 19 11:21:15 2014
New Revision: 429825
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429825
Log:
chan_dahdi: Don't ignore setvar when using configuration section scheme.
When the configuration section scheme of chan_dahdi.conf is used (keyword
dahdichan instead of channel) all setvar= options are completely ignored.
No variable defined this way appears in the created DAHDI channels.
* Move the clearing of setvar values to after the deferred processing of
dahdichan.
AST-1378 #close
Reported by: Guenther Kelleter
Patch by: Guenther Kelleter
Modified:
branches/11/channels/chan_dahdi.c
Modified: branches/11/channels/chan_dahdi.c
URL:
http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_dahdi.c?view=diff&rev=429825&r1=429824&r2=429825
==============================================================================
--- branches/11/channels/chan_dahdi.c (original)
+++ branches/11/channels/chan_dahdi.c Fri Dec 19 11:21:15 2014
@@ -18702,12 +18702,6 @@
ast_log(LOG_WARNING, "Ignoring any changes to '%s' (on
reload) at line %d.\n", v->name, v->lineno);
}
- /* Since confp has already filled invidual dahdi_pvt objects with
channels at this point, clear the variables in confp's pvt. */
- if (confp->chan.vars) {
- ast_variables_destroy(confp->chan.vars);
- confp->chan.vars = NULL;
- }
-
if (dahdichan) {
/* Process the deferred dahdichan value. */
if (build_channels(confp, dahdichan->value, reload,
dahdichan->lineno,
@@ -18720,6 +18714,15 @@
return -1;
}
}
+ }
+
+ /*
+ * Since confp has already filled individual dahdi_pvt objects with
channels
+ * at this point, clear the variables in confp's pvt.
+ */
+ if (confp->chan.vars) {
+ ast_variables_destroy(confp->chan.vars);
+ confp->chan.vars = NULL;
}
/* mark the first channels of each DAHDI span to watch for their span
alarms */
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
