Skip to content
Snippets Groups Projects
Commit 15ed7af0 authored by Sean Bright's avatar Sean Bright
Browse files

pbx_realtime: Prevent premature extension matching

The patterns provided by pbx_realtime were checked in the order in
which they were returned from the realtime backend. If there was
overlap between multiple patterns, the first one to correctly match was
chosen even though it may not have been the best match.

We now sort the patterns descending by their length and compare in that
order. There may be cases where this still results in a sub-optimal
match, but this patch should improve the overall behavior.

ASTERISK-18271 #close
Reported by: Charlie Smurthwaite

Change-Id: I56d9ac15810eb1775966b669c3028e32cc7bd809
parent afcdadcd
No related branches found
No related tags found
Loading
......@@ -141,6 +141,13 @@ static void *cleanup(void *unused)
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.
......@@ -191,6 +198,9 @@ static struct ast_variable *realtime_switch_common(const char *table, const char
if (cfg) {
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))) {
const char *realtime_exten = ast_variable_retrieve(cfg, cat, "exten");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment