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

Reverting regex part of -r403545 at request of file.

Browse Source 
res_sorcery_astdb.c: Fix get multiple records by regex.

* Fix sorcery_astdb_retrieve_regex() pattern matching.  Let the regexec()
function match the stored key values instead of having astdb prefilter
them.  Previoiusly you could only use a simple regex pattern when the
pattern began with '^'.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@403559 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-12-09 19:23:49 +00:00
parent 3a6aa0867c
commit e08b39cf3a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_sorcery_astdb.c
View File

@@ -218,14 +218,20 @@ static void sorcery_astdb_retrieve_multiple(const struct ast_sorcery *sorcery, v
static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex) static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex)
{ {
const char *prefix = data; const char *prefix = data;
char family[strlen(prefix) + strlen(type) + 2]; char family[strlen(prefix) + strlen(type) + 2], tree[strlen(regex) + 1];
RAII_VAR(struct ast_db_entry *, entries, NULL, ast_db_freetree); RAII_VAR(struct ast_db_entry *, entries, NULL, ast_db_freetree);
regex_t expression; regex_t expression;
struct ast_db_entry *entry; struct ast_db_entry *entry;
snprintf(family, sizeof(family), "%s/%s", prefix, type); snprintf(family, sizeof(family), "%s/%s", prefix, type);
if (!(entries = ast_db_gettree(family, NULL)) || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { if (regex[0] == '^') {
snprintf(tree, sizeof(tree), "%s%%", regex + 1);
} else {
tree[0] = '\0';
}
if (!(entries = ast_db_gettree(family, tree)) || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) {
return; return;
} }