diff options
author | Sean Bright <sean.bright@gmail.com> | 2017-02-11 10:57:03 -0500 |
---|---|---|
committer | Sean Bright <sean.bright@gmail.com> | 2017-02-13 11:33:15 -0500 |
commit | 3f9437377809a8c1476a1195474eb3178b2c7934 (patch) | |
tree | 74fd534bc18dcbaf3c7f13d561d647b24899a87d /channels/chan_sip.c | |
parent | 5780492cd725858628c32b42d72152455f2525c3 (diff) |
cli: Fix various CLI documentation and completion issues
* app_minivm: Use built-in completion facilities to complete optional
arguments.
* app_voicemail: Use built-in completion facilities to complete
optional arguments.
* app_confbridge: Add missing colons after 'Usage' text.
* chan_alsa: Use built-in completion facilities to complete optional
arguments.
* chan_sip: Use built-in completion facilities to complete optional
arguments. Add completions for 'load' for 'sip show user', 'sip show
peer', and 'sip qualify peer.'
* chan_skinny: Correct and extend completions for 'skinny reset' and
'skinny show line.'
* func_odbc: Correct completions for 'odbc read' and 'odbc write'
* main/astmm: Use built-in completion facilities to complete arguments
for 'memory' commands.
* main/bridge: Correct completions for 'bridge kick.'
* main/ccss: Use built-in completion facilities to complete arguments
for 'cc cancel' command.
* main/cli: Add 'all' completion for 'channel request hangup.' Correct
completions for 'core set debug channel.' Correct completions for 'core
show calls.'
* main/pbx_app: Remove redundant completions for 'core show
applications.'
* main/pbx_hangup_handler: Remove unused completions for 'core show
hanguphandlers all.'
* res_sorcery_memory_cache: Add completion for 'reload' argument of
'sorcery memory cache stale' and properly implement.
Change-Id: Iee58c7392f6fec34ad9d596109117af87697bbca
Diffstat (limited to 'channels/chan_sip.c')
-rw-r--r-- | channels/chan_sip.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 3bb6e74b6..7dcb48b21 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -19585,7 +19585,7 @@ static char *sip_show_inuse(struct ast_cli_entry *e, int cmd, struct ast_cli_arg switch (cmd) { case CLI_INIT: - e->command = "sip show inuse"; + e->command = "sip show inuse [all]"; e->usage = "Usage: sip show inuse [all]\n" " List all SIP devices usage counters and limits.\n" @@ -19775,7 +19775,7 @@ static char *sip_show_users(struct ast_cli_entry *e, int cmd, struct ast_cli_arg switch (cmd) { case CLI_INIT: - e->command = "sip show users"; + e->command = "sip show users [like]"; e->usage = "Usage: sip show users [like <pattern>]\n" " Lists all known SIP users.\n" @@ -19914,7 +19914,7 @@ static char *sip_show_peers(struct ast_cli_entry *e, int cmd, struct ast_cli_arg { switch (cmd) { case CLI_INIT: - e->command = "sip show peers"; + e->command = "sip show peers [like]"; e->usage = "Usage: sip show peers [like <pattern>]\n" " Lists all known SIP peers.\n" @@ -20628,7 +20628,12 @@ static char *sip_show_peer(struct ast_cli_entry *e, int cmd, struct ast_cli_args " Option \"load\" forces lookup of peer in realtime storage.\n"; return NULL; case CLI_GENERATE: - return complete_sip_show_peer(a->line, a->word, a->pos, a->n); + if (a->pos == 4) { + static const char * const completions[] = { "load", NULL }; + return ast_cli_complete(a->word, completions, a->n); + } else { + return complete_sip_show_peer(a->line, a->word, a->pos, a->n); + } } return _sip_show_peer(0, a->fd, NULL, NULL, a->argc, (const char **) a->argv); } @@ -20798,7 +20803,12 @@ static char *sip_qualify_peer(struct ast_cli_entry *e, int cmd, struct ast_cli_a " Option \"load\" forces lookup of peer in realtime storage.\n"; return NULL; case CLI_GENERATE: - return complete_sip_show_peer(a->line, a->word, a->pos, a->n); + if (a->pos == 4) { + static const char * const completions[] = { "load", NULL }; + return ast_cli_complete(a->word, completions, a->n); + } else { + return complete_sip_show_peer(a->line, a->word, a->pos, a->n); + } } return _sip_qualify_peer(0, a->fd, NULL, NULL, a->argc, (const char **) a->argv); } @@ -21169,7 +21179,12 @@ static char *sip_show_user(struct ast_cli_entry *e, int cmd, struct ast_cli_args " Option \"load\" forces lookup of peer in realtime storage.\n"; return NULL; case CLI_GENERATE: - return complete_sip_show_user(a->line, a->word, a->pos, a->n); + if (a->pos == 4) { + static const char * const completions[] = { "load", NULL }; + return ast_cli_complete(a->word, completions, a->n); + } else { + return complete_sip_show_user(a->line, a->word, a->pos, a->n); + } } if (a->argc < 4) |