kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 233093 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@233236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthias Nick
2009-12-04 20:29:30 +00:00
parent 2abb6f70b8
commit 420bfdf561
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pbx/pbx_config.c
View File

@@ -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); ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
ipri = 0; ipri = 0;
} }
appl = S_OR(stringp, ""); appl = S_OR(stringp, "");
/* Find the first occurrence of '(' */ /* Find the first occurrence of '(' */
firstp = strchr(appl, '('); if (!(firstp = strchr(appl, '('))) {
if (!firstp) {
/* No arguments */ /* No arguments */
data = ""; data = "";
} else { } else {
char *orig_appl = ast_strdup(appl);
if (!orig_appl)
return -1;
appl = strsep(&stringp, "("); appl = strsep(&stringp, "(");
data = stringp;
end = strrchr(data, ')'); /* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)} */
if ((end = strrchr(data, ')'))) { if (strstr(appl, "${") || strstr(appl, "$[")){
*end = '\0'; /* set appl to original one */
strcpy(appl, orig_appl);
/* set no data */
data = "";
/* no variable before application found -> go ahead */
} else { } 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) if (!data)