diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-18 19:26:07 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-18 19:26:07 +0000 |
| commit | 7e17adbbd884860e0d7cc076834a1d7a6fd5b1a8 (patch) | |
| tree | aa17c552062a86eafb3795cd6815da7b91b7e0fc /funcs | |
| parent | 5f69fa847c4cd5af8a8b273dfdb3f93d301c6615 (diff) | |
Make HASHes inheritable across channel creation.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@241012 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 5dbd83af3..afabb0f12 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -831,7 +831,16 @@ static int array(struct ast_channel *chan, const char *cmd, char *var, arg2.val[i]); if (i < arg2.argc) { if (ishash) { - snprintf(varname, sizeof(varname), HASH_FORMAT, origvar, arg1.var[i]); + if (origvar[0] == '_') { + if (origvar[1] == '_') { + snprintf(varname, sizeof(varname), "__" HASH_FORMAT, origvar + 2, arg1.var[i]); + } else { + snprintf(varname, sizeof(varname), "_" HASH_FORMAT, origvar + 1, arg1.var[i]); + } + } else { + snprintf(varname, sizeof(varname), HASH_FORMAT, origvar, arg1.var[i]); + } + pbx_builtin_setvar_helper(chan, varname, arg2.val[i]); } else { pbx_builtin_setvar_helper(chan, arg1.var[i], arg2.val[i]); @@ -909,7 +918,15 @@ static int hash_write(struct ast_channel *chan, const char *cmd, char *var, cons } AST_STANDARD_APP_ARGS(arg, var); - snprintf(varname, sizeof(varname), HASH_FORMAT, arg.hashname, arg.hashkey); + if (arg.hashname[0] == '_') { + if (arg.hashname[1] == '_') { + snprintf(varname, sizeof(varname), "__" HASH_FORMAT, arg.hashname + 2, arg.hashkey); + } else { + snprintf(varname, sizeof(varname), "_" HASH_FORMAT, arg.hashname + 1, arg.hashkey); + } + } else { + snprintf(varname, sizeof(varname), HASH_FORMAT, arg.hashname, arg.hashkey); + } pbx_builtin_setvar_helper(chan, varname, value); return 0; |