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

Merge "res_pjsip_notify: improve realtime performance on CLI completion on the endpoint" into 16

Browse Source
This commit is contained in:
George Joseph
2018-10-29 13:22:52 -05:00
committed by Gerrit Code Review
parent 3ba66b8a9d fbee505611
commit e8eb659afa
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/res_pjsip_notify.c
View File

@@ -888,30 +888,30 @@ static enum notify_result push_notify_channel(const char *channel_name, void *in
* \internal * \internal
* \brief Do completion on the endpoint. * \brief Do completion on the endpoint.
*/ */
static char *cli_complete_endpoint(const char *word, int state) static char *cli_complete_endpoint(const char *word)
{ {
char *result = NULL;
int wordlen = strlen(word); int wordlen = strlen(word);
int which = 0; struct ao2_container * endpoints;
struct ast_sip_endpoint *endpoint; struct ast_sip_endpoint *endpoint;
RAII_VAR(struct ao2_container *, endpoints, struct ao2_iterator i;
ast_sip_get_endpoints(), ao2_cleanup);
struct ao2_iterator i = ao2_iterator_init(endpoints, 0); endpoints = ast_sorcery_retrieve_by_prefix(ast_sip_get_sorcery(),
"endpoint", word, wordlen);
if (endpoints == NULL) {
return NULL;
}
i = ao2_iterator_init(endpoints, 0);
while ((endpoint = ao2_iterator_next(&i))) { while ((endpoint = ao2_iterator_next(&i))) {
const char *name = ast_sorcery_object_get_id(endpoint); ast_cli_completion_add(
if (!strncasecmp(word, name, wordlen) && ++which > state) { ast_strdup(ast_sorcery_object_get_id(endpoint)));
result = ast_strdup(name);
}
ao2_cleanup(endpoint); ao2_cleanup(endpoint);
if (result) {
break;
}
} }
ao2_iterator_destroy(&i); ao2_iterator_destroy(&i);
return result;
ao2_ref(endpoints, -1);
return NULL;
} }
/*! /*!
@@ -967,7 +967,7 @@ static char *cli_complete_notify(const char *line, const char *word,
return c; return c;
} }
return pos > 4 && !using_uri ? cli_complete_endpoint(word, state) : NULL; return pos > 4 && !using_uri ? cli_complete_endpoint(word) : NULL;
} }
/*! /*!