diff options
author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:50:13 +0000 |
---|---|---|
committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-09 18:50:13 +0000 |
commit | 12ad49e444d6108b7312a46b389090d51b670a7f (patch) | |
tree | fe20338149990fed28e3936bbbd7162e69d1f938 /pbx | |
parent | f8d0dcac122feafe9ebd0aba502263f829c77667 (diff) |
Fixes an issue with dialplan pattern matching where the specificity for pattern ranges and pattern special characters was inconsistent.
(closes issue #16903)
Reported by: Nick_Lewis
Patches:
pbx.c-specificity.patch uploaded by Nick Lewis (license 657)
Tested by: Nick_Lewis
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@285710 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r-- | pbx/pbx_config.c | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index ae409edfd..67070454b 100644 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -1457,15 +1457,15 @@ process_extension: *cidmatch++ = '\0'; ast_shrink_phone_number(cidmatch); } - pri = S_OR(strsep(&stringp, ","), ""); - pri = ast_skip_blanks(pri); - pri = ast_trim_blanks(pri); + pri = ast_strip(S_OR(strsep(&stringp, ","), "")); if ((label = strchr(pri, '('))) { *label++ = '\0'; if ((end = strchr(label, ')'))) { *end = '\0'; } else { ast_log(LOG_WARNING, "Label missing trailing ')' at line %d\n", v->lineno); + ast_free(tc); + continue; } } if ((plus = strchr(pri, '+'))) { @@ -1478,17 +1478,27 @@ process_extension: ipri = lastpri + 1; } else { ast_log(LOG_WARNING, "Can't use 'next' priority on the first entry at line %d!\n", v->lineno); + ast_free(tc); + continue; } } else if (!strcmp(pri, "same") || !strcmp(pri, "s")) { if (lastpri > -2) { ipri = lastpri; } else { ast_log(LOG_WARNING, "Can't use 'same' priority on the first entry at line %d!\n", v->lineno); + ast_free(tc); + continue; } } else if (sscanf(pri, "%30d", &ipri) != 1 && (ipri = ast_findlabel_extension2(NULL, con, realext, pri, cidmatch)) < 1) { ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno); ipri = 0; + ast_free(tc); + continue; + } else if (ipri < 1) { + ast_log(LOG_WARNING, "Invalid priority '%s' at line %d\n", pri, v->lineno); + ast_free(tc); + continue; } appl = S_OR(stringp, ""); /* Find the first occurrence of '(' */ @@ -1498,9 +1508,11 @@ process_extension: } else { char *orig_appl = ast_strdup(appl); - if (!orig_appl) - return -1; - + if (!orig_appl) { + ast_free(tc); + continue; + } + appl = strsep(&stringp, "("); /* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)} */ @@ -1527,8 +1539,8 @@ process_extension: ipri += atoi(plus); } lastpri = ipri; - if (!ast_opt_dont_warn && !strcmp(realext, "_.")) { - ast_log(LOG_WARNING, "The use of '_.' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X.' instead at line %d\n", v->lineno); + if (!ast_opt_dont_warn && (!strcmp(realext, "_.") || !strcmp(realext, "_!"))) { + ast_log(LOG_WARNING, "The use of '%s' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X%c' instead at line %d\n", realext, realext[1], v->lineno); } if (ast_add_extension2(con, 0, realext, ipri, label, cidmatch, appl, strdup(data), ast_free_ptr, registrar)) { ast_log(LOG_WARNING, "Unable to register extension at line %d\n", v->lineno); @@ -1738,13 +1750,13 @@ static int pbx_load_module(void) static int load_module(void) { - if (pbx_load_module()) - return AST_MODULE_LOAD_DECLINE; - if (static_config && !write_protect_config) ast_cli_register(&cli_dialplan_save); ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config)); + if (pbx_load_module()) + return AST_MODULE_LOAD_DECLINE; + return AST_MODULE_LOAD_SUCCESS; } |