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

Merge "pbx_realtime: Prevent premature extension matching" into 13

Browse Source
This commit is contained in:
zuul
2017-02-22 12:08:47 -06:00
committed by Gerrit Code Review
parent 89e0bf6ddd ca6d001144
commit 726e3945c3
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pbx/pbx_realtime.c
View File

@@ -143,6 +143,13 @@ static void *cleanup(void *unused)
return NULL; return NULL;
} }
static int extension_length_comparator(struct ast_category *p, struct ast_category *q)
{
const char *extenp = S_OR(ast_variable_find(p, "exten"), "");
const char *extenq = S_OR(ast_variable_find(q, "exten"), "");
return strlen(extenp) - strlen(extenq);
}
/* Realtime switch looks up extensions in the supplied realtime table. /* Realtime switch looks up extensions in the supplied realtime table.
@@ -193,6 +200,9 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
if (cfg) { if (cfg) {
char *cat = NULL; char *cat = NULL;
/* Sort so that longer patterns are checked first */
ast_config_sort_categories(cfg, 1, extension_length_comparator);
while ((cat = ast_category_browse(cfg, cat))) { while ((cat = ast_category_browse(cfg, cat))) {
const char *realtime_exten = ast_variable_retrieve(cfg, cat, "exten"); const char *realtime_exten = ast_variable_retrieve(cfg, cat, "exten");