diff options
author | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 21:00:46 +0000 |
---|---|---|
committer | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 21:00:46 +0000 |
commit | a5ae489f4a1fd6cfd04ee9bd8372e994c156b4fa (patch) | |
tree | abfc095f0d654af7fc4ee81c1b82be6d9d388fc0 /pbx/pbx_config.c | |
parent | 7b9b7d499187734ceb6623407b011287e457daca (diff) |
Merged revisions 233093 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r233093 | mnick | 2009-12-04 11:15:47 -0600 (Fri, 04 Dec 2009) | 8 lines
Parse global variables or expressions in hint extensions
Parse global variables or expressions in hint extensions. Like: exten => 400,hint,DAHDI/i2/${GLOBAL(var)}
(closes issue #16166)
Reported by: rmudgett
Tested by: mnick, rmudgett
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@233238 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx/pbx_config.c')
-rw-r--r-- | pbx/pbx_config.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 4ff5d1fe3..d69f1c54c 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1450,14 +1450,29 @@ static int pbx_load_config(const char *config_file) /* No arguments */ data = ""; } else { + char *orig_appl = ast_strdup(appl); + + if (!orig_appl) + return -1; + appl = strsep(&stringp, "("); - data = stringp; - end = strrchr(data, ')'); - if ((end = strrchr(data, ')'))) { - *end = '\0'; + + /* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)} */ + if (strstr(appl, "${") || strstr(appl, "$[")){ + /* set appl to original one */ + strcpy(appl, orig_appl); + /* set no data */ + data = ""; + /* no variable before application found -> go ahead */ } else { - ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data); + data = S_OR(stringp, ""); + if ((end = strrchr(data, ')'))) { + *end = '\0'; + } else { + ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data); + } } + ast_free(orig_appl); } if (!data) |