diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-03 18:47:48 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-03 18:47:48 +0000 |
commit | d939de1b4fa5c319f0761dba72598472def0b09d (patch) | |
tree | f6a2541d63548b7b74e81116fb353dd009067bc4 /channels | |
parent | c2dd998774578b04561c92e90676245f721f128c (diff) |
Merged revisions 244505 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r244505 | tilghman | 2010-02-03 12:34:29 -0600 (Wed, 03 Feb 2010) | 8 lines
The chanvar= setting should inherit the entire list of variables, not just the first one.
(closes issue #16359)
Reported by: raarts
Patches:
dahdi-setvars.diff uploaded by raarts (license 937)
Tested by: raarts
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@244508 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9718bcd26..853fc8fb7 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -10517,7 +10517,13 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, tmp->callgroup = conf->chan.callgroup; tmp->pickupgroup= conf->chan.pickupgroup; if (conf->chan.vars) { - tmp->vars = ast_variable_new(conf->chan.vars->name, conf->chan.vars->value, ""); + struct ast_variable *v, *tmpvar; + for (v = conf->chan.vars ; v ; v = v->next) { + if ((tmpvar = ast_variable_new(v->name, v->value, v->file))) { + tmpvar->next = tmp->vars; + tmp->vars = tmpvar; + } + } } tmp->cid_rxgain = conf->chan.cid_rxgain; tmp->rxgain = conf->chan.rxgain; |