diff options
author | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 20:29:30 +0000 |
---|---|---|
committer | mnick <mnick@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-12-04 20:29:30 +0000 |
commit | f63599a487f0932da0aec3101bb56cce0d56e1b8 (patch) | |
tree | 96e4d803985ffb0b67efffe9c0073390b7cb558f /pbx | |
parent | 8cf4234323010fae69c4602d1ddde52877e522b2 (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.0@233236 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/pbx_config.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index e55dcf51f..1c99021f4 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1426,21 +1426,36 @@ static int pbx_load_config(const char *config_file) ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno); ipri = 0; } + appl = S_OR(stringp, ""); /* Find the first occurrence of '(' */ - firstp = strchr(appl, '('); - if (!firstp) { + if (!(firstp = strchr(appl, '('))) { /* 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) |