kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 06:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "named_acl: Use ast_cli_completion_add."

Browse Source
This commit is contained in:
Joshua Colp
2018-03-20 09:51:41 -05:00
committed by Gerrit Code Review
parent 1a2f12e288 201762f161
commit dc2ce3ce32
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/named_acl.c
View File

@@ -475,12 +475,10 @@ static void cli_display_named_acl_list(int fd)
/* \brief ACL command show <name> */
static char *handle_show_named_acl_cmd(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
struct named_acl_config *cfg;
int length;
int which;
struct ao2_iterator i;
struct named_acl *named_acl;
char *match = NULL;
switch (cmd) {
case CLI_INIT:
@@ -490,23 +488,29 @@ static char *handle_show_named_acl_cmd(struct ast_cli_entry *e, int cmd, struct
" Shows a list of named ACLs or lists all entries in a given named ACL.\n";
return NULL;
case CLI_GENERATE:
if (a->pos != 2) {
return NULL;
}
cfg = ao2_global_obj_ref(globals);
if (!cfg) {
return NULL;
}
length = strlen(a->word);
which = 0;
i = ao2_iterator_init(cfg->named_acl_list, 0);
while ((named_acl = ao2_iterator_next(&i))) {
if (!strncasecmp(a->word, named_acl->name, length) && ++which > a->n) {
match = ast_strdup(named_acl->name);
ao2_ref(named_acl, -1);
break;
if (!strncasecmp(a->word, named_acl->name, length)) {
if (ast_cli_completion_add(ast_strdup(named_acl->name))) {
ao2_ref(named_acl, -1);
break;
}
}
ao2_ref(named_acl, -1);
}
ao2_iterator_destroy(&i);
return match;
ao2_ref(cfg, -1);
return NULL;
}
if (a->argc == 2) {