kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

accept asterisk N/X/Z/. notation everywhere regexes are expected when they start with _ 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13287 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-05-12 17:10:57 +00:00
parent fd115395f9
commit 3c6b98d00f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_utils.h
View File

@ -514,7 +514,7 @@ SWITCH_DECLARE(char *) switch_separate_paren_args(char *str);
SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str); SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str);
SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip);
SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup);
SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len); SWITCH_DECLARE(switch_bool_t) switch_ast2regex(const char *pat, char *rbuf, size_t len);
/*! /*!
\brief Escape a string by prefixing a list of characters with an escape character \brief Escape a string by prefixing a list of characters with an escape character

7
src/switch_regex.c
View File

@ -60,11 +60,18 @@ SWITCH_DECLARE(int) switch_regex_perform(const char *field, const char *expressi
int match_count = 0; int match_count = 0;
char *tmp = NULL; char *tmp = NULL;
uint32_t flags = 0; uint32_t flags = 0;
char abuf[256] = "";
if (!(field && expression)) { if (!(field && expression)) {
return 0; return 0;
} }
if (*expression == '_') {
if (switch_ast2regex(expression + 1, abuf, sizeof(abuf))) {
expression = abuf;
}
}
if (*expression == '/') { if (*expression == '/') {
char *opts = NULL; char *opts = NULL;
tmp = strdup(expression + 1); tmp = strdup(expression + 1);

4
src/switch_utils.c
View File

@ -565,9 +565,9 @@ SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip)
)? SWITCH_FALSE : SWITCH_TRUE; )? SWITCH_FALSE : SWITCH_TRUE;
} }
SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len) SWITCH_DECLARE(switch_bool_t) switch_ast2regex(const char *pat, char *rbuf, size_t len)
{ {
char *p = pat; const char *p = pat;
if (!pat) { if (!pat) {
return SWITCH_FALSE; return SWITCH_FALSE;