sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "pjsip: Improve CLI completion performance"

This commit is contained in:
Jenkins2 2017-12-11 09:36:54 -06:00 committed by Gerrit Code Review
parent 6d25b26933 521f741b04
commit cd741136c5
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
res/res_pjsip/pjsip_cli.c
View File

@ -82,31 +82,22 @@ int ast_sip_cli_print_sorcery_objectset(void *obj, void *arg, int flags)
return 0;
}
static char *complete_show_sorcery_object(struct ao2_container *container,
static void complete_show_sorcery_object(struct ao2_container *container,
struct ast_sip_cli_formatter_entry *formatter_entry,
const char *word, int state)
const char *word)
{
char *result = NULL;
int wordlen = strlen(word);
int which = 0;
struct ao2_iterator i = ao2_iterator_init(container, 0);
size_t wordlen = strlen(word);
void *object;
struct ao2_iterator i = ao2_iterator_init(container, 0);
while ((object = ao2_t_iterator_next(&i, "iterate thru endpoints table"))) {
const char *id = formatter_entry->get_id(object);
if (!strncasecmp(word, id, wordlen)
&& ++which > state) {
result = ast_strdup(id);
if (!strncasecmp(word, id, wordlen)) {
ast_cli_completion_add(ast_strdup(id));
}
ao2_t_ref(object, -1, "toss iterator endpoint ptr before break");
if (result) {
break;
}
}
ao2_iterator_destroy(&i);
return result;
}
static void dump_str_and_free(int fd, struct ast_str *buf)
@ -211,7 +202,8 @@ char *ast_sip_cli_traverse_objects(struct ast_cli_entry *e, int cmd, struct ast_
if (cmd == CLI_GENERATE) {
ast_free(context.output_buffer);
return complete_show_sorcery_object(container, formatter_entry, a->word, a->n);
complete_show_sorcery_object(container, formatter_entry, a->word);
return NULL;
}
if (is_container) {