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

pbx: Create pbx_ignorepat.c for management of 'struct ast_ignorepat'.

Browse Source 
This changes context ignore patterns from a linked list to a vector,
makes 'struct ast_ignorepat' opaque to pbx.c.

Although ast_walk_context_ignorepats is maintained the procedure is no
longer efficient except for the first call (inc==NULL).  This
functionality is replaced by two new functions implemented by vector
macros.
* ast_context_ignorepats_count (AST_VECTOR_SIZE)
* ast_context_ignorepats_get (AST_VECTOR_GET)

As with ast_walk_context_ignorepats callers of these functions are
expected to have locked contexts.  Only a few places in Asterisk walked
the ignorepats, they have been converted to use the new functions.

Change-Id: I78f2157d275ef1b7d624b4ff7d770d38e5d7f20a
This commit is contained in:
Corey Farrell
2016-07-15 03:59:48 -04:00
parent be36bd7ca5
commit e2e8713b84
8 changed files with 233 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pbx/pbx_config.c
View File

@@ -213,15 +213,25 @@ static int lookup_ci(struct ast_context *c, const char *name)
/*! \brief return true if 'name' is in the ignorepats for context c */
static int lookup_c_ip(struct ast_context *c, const char *name)
{
struct ast_ignorepat *ip = NULL;
int idx;
int ret = 0;
if (ast_rdlock_context(c)) /* error, skip */
if (ast_rdlock_context(c)) {
/* error, skip */
return 0;
while ( (ip = ast_walk_context_ignorepats(c, ip)) )
if (!strcmp(name, ast_get_ignorepat_name(ip)))
}
for (idx = 0; idx < ast_context_ignorepats_count(c); idx++) {
const struct ast_ignorepat *ip = ast_context_ignorepats_get(c, idx);
if (!strcmp(name, ast_get_ignorepat_name(ip))) {
ret = -1;
break;
}
}
ast_unlock_context(c);
return ip ? -1 /* success */ : 0;
return ret;
}
/*! \brief moves to the n-th word in the string, or empty string if none */
@@ -918,7 +928,6 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
int context_header_written = 0;
struct ast_exten *ext, *last_written_e = NULL;
int idx;
struct ast_ignorepat *ip;
struct ast_sw *sw;
/* try to lock context and fireout all info */
@@ -1019,7 +1028,9 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
fprintf(output, "\n");
/* fireout ignorepats ... */
for (ip = NULL; (ip = ast_walk_context_ignorepats(c, ip)); ) {
for (idx = 0; idx < ast_context_ignorepats_count(c); idx++) {
const struct ast_ignorepat *ip = ast_context_ignorepats_get(c, idx);
if (strcmp(ast_get_ignorepat_registrar(ip), registrar) != 0)
continue; /* not mine */
PUT_CTX_HDR;
@@ -1486,12 +1497,13 @@ static char *complete_dialplan_remove_ignorepat(struct ast_cli_args *a)
}
for (c = NULL; !ret && (c = ast_walk_contexts(c));) {
struct ast_ignorepat *ip;
int idx;
if (ast_rdlock_context(c)) /* error, skip it */
continue;
for (ip = NULL; !ret && (ip = ast_walk_context_ignorepats(c, ip));) {
for (idx = 0; idx < ast_context_ignorepats_count(c); idx++) {
const struct ast_ignorepat *ip = ast_context_ignorepats_get(c, idx);
if (partial_match(ast_get_ignorepat_name(ip), a->word, len) && ++which > a->n) {
/* n-th match */
struct ast_context *cw = NULL;