kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 19:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add 'early-match' wildcard for extension patterns (bug #3889)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-04-03 21:32:33 +00:00
parent 6ae8903fd8
commit ee9c852b4d
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pbx.c
View File

@@ -633,6 +633,9 @@ static void pbx_destroy(struct ast_pbx *p)
case '.':\ case '.':\
/* Must match */\ /* Must match */\
return 1;\ return 1;\
case '+':\
/* Early match */\
return 2;\
case ' ':\ case ' ':\
case '-':\ case '-':\
/* Ignore these characters */\ /* Ignore these characters */\
@@ -645,6 +648,9 @@ static void pbx_destroy(struct ast_pbx *p)
data++;\ data++;\
pattern++;\ pattern++;\
}\ }\
/* If we ran off the end of the data and the pattern ends in '+', match */\
if (match && !*data && (*pattern == '+'))\
return 2;\
} }
int ast_extension_match(const char *pattern, const char *data) int ast_extension_match(const char *pattern, const char *data)
@@ -673,8 +679,9 @@ int ast_extension_close(const char *pattern, const char *data, int needmore)
return 1; return 1;
} }
EXTENSION_MATCH_CORE(data,pattern,match); EXTENSION_MATCH_CORE(data,pattern,match);
/* If there's more or we don't care about more, return non-zero, otlherwise it's a miss */ /* If there's more or we don't care about more, or if it's a possible early match,
if (!needmore || *pattern) { return non-zero; otherwise it's a miss */
if (!needmore || *pattern || match == 2) {
return match; return match;
} else } else
return 0; return 0;
@@ -754,15 +761,23 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan, struct ast
while(tmp) { while(tmp) {
/* Match context */ /* Match context */
if (bypass || !strcmp(tmp->name, context)) { if (bypass || !strcmp(tmp->name, context)) {
struct ast_exten *earlymatch = NULL;
if (*status < STATUS_NO_EXTENSION) if (*status < STATUS_NO_EXTENSION)
*status = STATUS_NO_EXTENSION; *status = STATUS_NO_EXTENSION;
eroot = tmp->root; for (eroot = tmp->root; eroot; eroot=eroot->next) {
while(eroot) { int match = 0;
/* Match extension */ /* Match extension */
if ((((action != HELPER_MATCHMORE) && ast_extension_match(eroot->exten, exten)) || if ((((action != HELPER_MATCHMORE) && ast_extension_match(eroot->exten, exten)) ||
((action == HELPER_CANMATCH) && (ast_extension_close(eroot->exten, exten, 0))) || ((action == HELPER_CANMATCH) && (ast_extension_close(eroot->exten, exten, 0))) ||
((action == HELPER_MATCHMORE) && (ast_extension_close(eroot->exten, exten, 1)))) && ((action == HELPER_MATCHMORE) && (match = ast_extension_close(eroot->exten, exten, 1)))) &&
(!eroot->matchcid || matchcid(eroot->cidmatch, callerid))) { (!eroot->matchcid || matchcid(eroot->cidmatch, callerid))) {
if (action == HELPER_MATCHMORE && match == 2 && !earlymatch) {
/* It matched an extension ending in a '+' wildcard
So ignore it for now, unless there's a better match */
earlymatch = eroot;
} else {
e = eroot; e = eroot;
if (*status < STATUS_NO_PRIORITY) if (*status < STATUS_NO_PRIORITY)
*status = STATUS_NO_PRIORITY; *status = STATUS_NO_PRIORITY;
@@ -783,8 +798,15 @@ static struct ast_exten *pbx_find_extension(struct ast_channel *chan, struct ast
} }
e = e->peer; e = e->peer;
} }
}
} }
eroot = eroot->next; }
if (earlymatch) {
/* Bizarre logic for HELPER_MATCHMORE. We return zero to break out
of the loop waiting for more digits, and _then_ match (normally)
the extension we ended up with. We got an early-matching wildcard
pattern, so return NULL to break out of the loop. */
return NULL;
} }
/* Check alternative switches */ /* Check alternative switches */
sw = tmp->alts; sw = tmp->alts;