diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-18 19:26:07 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-18 19:26:07 +0000 |
| commit | f6b5cf960f2856ee4d9a7144e37b89542c0ef85c (patch) | |
| tree | aa17c552062a86eafb3795cd6815da7b91b7e0fc | |
| parent | 1649ae071cec23c93159eea9ef9dd38239681ef6 (diff) | |
Make HASHes inheritable across channel creation.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@241012 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | funcs/func_strings.c | 21 |
2 files changed, 22 insertions, 2 deletions
@@ -183,6 +183,9 @@ Dialplan Functions * Added PASSTHRU, which literally passes the same argument back as its return value. The intent is to be able to use a literal string argument to functions that currently require a variable name as an argument. + * HASH-associated variables now can be inherited across channel creation, by + prefixing the name of the hash at assignment with the appropriate number of + underscores, just like variables. Dialplan Variables ------------------ 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; |