diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2014-12-19 17:31:28 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2014-12-19 17:31:28 +0000 |
| commit | 7074bf956b1ec215b55176c5f0137924450a2749 (patch) | |
| tree | 3348f98bc14a06faa07ea3e46bce16dc09a11126 /channels | |
| parent | 6a99df47c09e9d9f51ea6afba76b259832eadb51 (diff) | |
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
........
Merged revisions 429825 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@429829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index ddaeccd4f..bb6bd2d42 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -18927,12 +18927,6 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct 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)) { @@ -18946,6 +18940,15 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct } } + /* + * 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 */ for (tmp = iflist, y=-1; tmp; tmp = tmp->next) { if (!tmp->destroy && tmp->span != y) { |