Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

cli: Fix various CLI documentation and completion issues

Browse Source 
* 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/asterisk: Correct and extend completions for 'core show file
version.'

* 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
changes/35/4935/1
Sean Bright 8 years ago
parent c7fcc4468f
commit ea8a610776
15 changed files with 129 additions and 110 deletions
Show Stats Download Patch File Download Diff File

8
apps/app_minivm.c
Unescape View File

@ -3016,11 +3016,9 @@ static char *complete_minivm_show_users(const char *line, const char *word, int
struct minivm_account *vmu; struct minivm_account *vmu;
const char *domain = ""; const char *domain = "";
/* 0 - voicemail; 1 - list; 2 - accounts; 3 - for; 4 - <domain> */ /* 0 - minivm; 1 - list; 2 - accounts; 3 - for; 4 - <domain> */
if (pos > 4) if (pos > 4)
return NULL; return NULL;
if (pos == 3)
return (state == 0) ? ast_strdup("for") : NULL;
wordlen = strlen(word); wordlen = strlen(word);
AST_LIST_TRAVERSE(&minivm_accounts, vmu, list) { AST_LIST_TRAVERSE(&minivm_accounts, vmu, list) {
if (!strncasecmp(word, vmu->domain, wordlen)) { if (!strncasecmp(word, vmu->domain, wordlen)) {
@ -3042,9 +3040,9 @@ static char *handle_minivm_show_users(struct ast_cli_entry *e, int cmd, struct a
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "minivm list accounts"; e->command = "minivm list accounts [for]";
e->usage = e->usage =
"Usage: minivm list accounts\n" "Usage: minivm list accounts [for <domain>]\n"
" Lists all mailboxes currently set up\n"; " Lists all mailboxes currently set up\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:

6
apps/app_voicemail.c
Unescape View File

@ -12668,11 +12668,9 @@ static char *complete_voicemail_show_users(const char *line, const char *word, i
struct ast_vm_user *vmu; struct ast_vm_user *vmu;
const char *context = ""; const char *context = "";
/* 0 - show; 1 - voicemail; 2 - users; 3 - for; 4 - <context> */ /* 0 - voicemail; 1 - show; 2 - users; 3 - for; 4 - <context> */
if (pos > 4) if (pos > 4)
return NULL; return NULL;
if (pos == 3)
return (state == 0) ? ast_strdup("for") : NULL;
wordlen = strlen(word); wordlen = strlen(word);
AST_LIST_TRAVERSE(&users, vmu, list) { AST_LIST_TRAVERSE(&users, vmu, list) {
if (!strncasecmp(word, vmu->context, wordlen)) { if (!strncasecmp(word, vmu->context, wordlen)) {
@ -12695,7 +12693,7 @@ static char *handle_voicemail_show_users(struct ast_cli_entry *e, int cmd, struc
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "voicemail show users"; e->command = "voicemail show users [for]";
e->usage = e->usage =
"Usage: voicemail show users [for <context>]\n" "Usage: voicemail show users [for <context>]\n"
" Lists all mailboxes currently set up\n"; " Lists all mailboxes currently set up\n";

12
apps/confbridge/conf_config_parser.c
Unescape View File

@ -1343,7 +1343,7 @@ static char *handle_cli_confbridge_show_user_profiles(struct ast_cli_entry *e, i
case CLI_INIT: case CLI_INIT:
e->command = "confbridge show profile users"; e->command = "confbridge show profile users";
e->usage = e->usage =
"Usage confbridge show profile users\n"; "Usage: confbridge show profile users\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return NULL; return NULL;
@ -1373,7 +1373,7 @@ static char *handle_cli_confbridge_show_user_profile(struct ast_cli_entry *e, in
case CLI_INIT: case CLI_INIT:
e->command = "confbridge show profile user"; e->command = "confbridge show profile user";
e->usage = e->usage =
"Usage confbridge show profile user [<profile name>]\n"; "Usage: confbridge show profile user [<profile name>]\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 4) { if (a->pos == 4) {
@ -1494,7 +1494,7 @@ static char *handle_cli_confbridge_show_bridge_profiles(struct ast_cli_entry *e,
case CLI_INIT: case CLI_INIT:
e->command = "confbridge show profile bridges"; e->command = "confbridge show profile bridges";
e->usage = e->usage =
"Usage confbridge show profile bridges\n"; "Usage: confbridge show profile bridges\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return NULL; return NULL;
@ -1526,7 +1526,7 @@ static char *handle_cli_confbridge_show_bridge_profile(struct ast_cli_entry *e,
case CLI_INIT: case CLI_INIT:
e->command = "confbridge show profile bridge"; e->command = "confbridge show profile bridge";
e->usage = e->usage =
"Usage confbridge show profile bridge <profile name>\n"; "Usage: confbridge show profile bridge <profile name>\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 4) { if (a->pos == 4) {
@ -1668,7 +1668,7 @@ static char *handle_cli_confbridge_show_menus(struct ast_cli_entry *e, int cmd,
case CLI_INIT: case CLI_INIT:
e->command = "confbridge show menus"; e->command = "confbridge show menus";
e->usage = e->usage =
"Usage confbridge show profile menus\n"; "Usage: confbridge show profile menus\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return NULL; return NULL;
@ -1702,7 +1702,7 @@ static char *handle_cli_confbridge_show_menu(struct ast_cli_entry *e, int cmd, s
case CLI_INIT: case CLI_INIT:
e->command = "confbridge show menu"; e->command = "confbridge show menu";
e->usage = e->usage =
"Usage confbridge show menu [<menu name>]\n"; "Usage: confbridge show menu [<menu name>]\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 3) { if (a->pos == 3) {

20
channels/chan_alsa.c
Unescape View File

@ -639,29 +639,13 @@ static struct ast_channel *alsa_request(const char *type, struct ast_format_cap
return tmp; return tmp;
} }
static char *autoanswer_complete(const char *line, const char *word, int pos, int state)
{
switch (state) {
case 0:
if (!ast_strlen_zero(word) && !strncasecmp(word, "on", MIN(strlen(word), 2)))
return ast_strdup("on");
case 1:
if (!ast_strlen_zero(word) && !strncasecmp(word, "off", MIN(strlen(word), 3)))
return ast_strdup("off");
default:
return NULL;
}
return NULL;
}
static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
char *res = CLI_SUCCESS; char *res = CLI_SUCCESS;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "console autoanswer"; e->command = "console autoanswer [on|off]";
e->usage = e->usage =
"Usage: console autoanswer [on|off]\n" "Usage: console autoanswer [on|off]\n"
" Enables or disables autoanswer feature. If used without\n" " Enables or disables autoanswer feature. If used without\n"
@ -669,7 +653,7 @@ static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli
" The default value of autoanswer is in 'alsa.conf'.\n"; " The default value of autoanswer is in 'alsa.conf'.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return autoanswer_complete(a->line, a->word, a->pos, a->n); return NULL;
} }
if ((a->argc != 2) && (a->argc != 3)) if ((a->argc != 2) && (a->argc != 3))

27
channels/chan_sip.c
Unescape View File

@ -19527,7 +19527,7 @@ static char *sip_show_inuse(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "sip show inuse"; e->command = "sip show inuse [all]";
e->usage = e->usage =
"Usage: sip show inuse [all]\n" "Usage: sip show inuse [all]\n"
" List all SIP devices usage counters and limits.\n" " List all SIP devices usage counters and limits.\n"
@ -19717,7 +19717,7 @@ static char *sip_show_users(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "sip show users"; e->command = "sip show users [like]";
e->usage = e->usage =
"Usage: sip show users [like <pattern>]\n" "Usage: sip show users [like <pattern>]\n"
" Lists all known SIP users.\n" " Lists all known SIP users.\n"
@ -19856,7 +19856,7 @@ static char *sip_show_peers(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
{ {
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "sip show peers"; e->command = "sip show peers [like]";
e->usage = e->usage =
"Usage: sip show peers [like <pattern>]\n" "Usage: sip show peers [like <pattern>]\n"
" Lists all known SIP peers.\n" " Lists all known SIP peers.\n"
@ -20570,7 +20570,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"; " Option \"load\" forces lookup of peer in realtime storage.\n";
return NULL; return NULL;
case CLI_GENERATE: 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); return _sip_show_peer(0, a->fd, NULL, NULL, a->argc, (const char **) a->argv);
} }
@ -20740,7 +20745,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"; " Option \"load\" forces lookup of peer in realtime storage.\n";
return NULL; return NULL;
case CLI_GENERATE: 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); return _sip_qualify_peer(0, a->fd, NULL, NULL, a->argc, (const char **) a->argv);
} }
@ -21111,7 +21121,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"; " Option \"load\" forces lookup of peer in realtime storage.\n";
return NULL; return NULL;
case CLI_GENERATE: 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) if (a->argc < 4)

40
channels/chan_skinny.c
Unescape View File

@ -3924,24 +3924,40 @@ static char *complete_skinny_show_device(const char *line, const char *word, int
static char *complete_skinny_reset(const char *line, const char *word, int pos, int state) static char *complete_skinny_reset(const char *line, const char *word, int pos, int state)
{ {
return (pos == 2 ? complete_skinny_devices(word, state) : NULL); if (pos == 2) {
static const char * const completions[] = { "all", NULL };
char *ret = ast_cli_complete(word, completions, state);
if (!ret) {
ret = complete_skinny_devices(word, state - 1);
}
return ret;
} else if (pos == 3) {
static const char * const completions[] = { "restart", NULL };
return ast_cli_complete(word, completions, state);
}
return NULL;
} }
static char *complete_skinny_show_line(const char *line, const char *word, int pos, int state) static char *complete_skinny_show_line(const char *line, const char *word, int pos, int state)
{ {
struct skinny_device *d; if (pos == 3) {
struct skinny_line *l; struct skinny_device *d;
int wordlen = strlen(word), which = 0; struct skinny_line *l;
int wordlen = strlen(word), which = 0;
if (pos != 3) AST_LIST_TRAVERSE(&devices, d, list) {
return NULL; AST_LIST_TRAVERSE(&d->lines, l, list) {
if (!strncasecmp(word, l->name, wordlen) && ++which > state) {
AST_LIST_TRAVERSE(&devices, d, list) { return ast_strdup(l->name);
AST_LIST_TRAVERSE(&d->lines, l, list) { }
if (!strncasecmp(word, l->name, wordlen) && ++which > state) {
return ast_strdup(l->name);
} }
} }
} else if (pos == 4) {
static const char * const completions[] = { "on", NULL };
return ast_cli_complete(word, completions, state);
} else if (pos == 5) {
return complete_skinny_devices(word, state);
} }
return NULL; return NULL;
@ -4583,7 +4599,7 @@ static char *handle_skinny_show_line(struct ast_cli_entry *e, int cmd, struct as
case CLI_INIT: case CLI_INIT:
e->command = "skinny show line"; e->command = "skinny show line";
e->usage = e->usage =
"Usage: skinny show line <Line> [ on <DeviceID|DeviceName> ]\n" "Usage: skinny show line <Line> [on <DeviceID|DeviceName>]\n"
" List all lineinformation of a specific line known to the Skinny subsystem.\n"; " List all lineinformation of a specific line known to the Skinny subsystem.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:

6
funcs/func_odbc.c
Unescape View File

@ -1419,7 +1419,8 @@ static char *cli_odbc_read(struct ast_cli_entry *e, int cmd, struct ast_cli_args
AST_RWLIST_UNLOCK(&queries); AST_RWLIST_UNLOCK(&queries);
return NULL; return NULL;
} else if (a->pos == 4) { } else if (a->pos == 4) {
return a->n == 0 ? ast_strdup("exec") : NULL; static const char * const completions[] = { "exec", NULL };
return ast_cli_complete(a->word, completions, a->n);
} else { } else {
return NULL; return NULL;
} }
@ -1625,7 +1626,8 @@ static char *cli_odbc_write(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
AST_RWLIST_UNLOCK(&queries); AST_RWLIST_UNLOCK(&queries);
return NULL; return NULL;
} else if (a->pos == 5) { } else if (a->pos == 5) {
return a->n == 0 ? ast_strdup("exec") : NULL; static const char * const completions[] = { "exec", NULL };
return ast_cli_complete(a->word, completions, a->n);
} else { } else {
return NULL; return NULL;
} }

24
main/asterisk.c
Unescape View File

@ -1064,35 +1064,30 @@ static char *handle_clear_profile(struct ast_cli_entry *e, int cmd, struct ast_c
static char *handle_show_version_files(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_show_version_files(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
#define FORMAT "%-25.25s %-40.40s\n" #define FORMAT "%-25.25s %-40.40s\n"
static const char * const completions[] = { "like", NULL };
struct registered_file *iterator; struct registered_file *iterator;
regex_t regexbuf; regex_t regexbuf;
int havepattern = 0; int havepattern = 0;
int havename = 0; int havename = 0;
int count_files = 0; int count_files = 0;
char *ret = NULL; char *ret = NULL;
int matchlen, which = 0;
struct registered_file *find;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "core show file version [like]"; e->command = "core show file version";
e->usage = e->usage =
"Usage: core show file version [like <pattern>]\n" "Usage: core show file version [<filename>|like <pattern>]\n"
" Lists the files along with the Asterisk version.\n" " Lists the files along with the Asterisk version.\n"
" Optional regular expression pattern is used to filter the file list.\n"; " Optional regular expression pattern is used to filter the file list.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
matchlen = strlen(a->word); if (a->pos != 4) {
if (a->pos != 3)
return NULL; return NULL;
AST_RWLIST_RDLOCK(&registered_files);
AST_RWLIST_TRAVERSE(&registered_files, find, list) {
if (!strncasecmp(a->word, find->file, matchlen) && ++which > a->n) {
ret = ast_strdup(find->file);
break;
}
} }
AST_RWLIST_UNLOCK(&registered_files); ret = ast_cli_complete(a->word, completions, a->n);
if (!ret) {
ret = ast_complete_source_filename(a->word, a->n - 1);
}
return ret; return ret;
} }
@ -1107,6 +1102,9 @@ static char *handle_show_version_files(struct ast_cli_entry *e, int cmd, struct
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
break; break;
case 5: case 5:
if (!strcasecmp(a->argv[4], "like")) {
return CLI_SHOWUSAGE;
}
havename = 1; havename = 1;
break; break;
case 4: case 4:

21
main/astmm.c
Unescape View File

@ -702,17 +702,12 @@ static char *handle_memory_atexit_list(struct ast_cli_entry *e, int cmd, struct
{ {
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "memory atexit list"; e->command = "memory atexit list {on|off}";
e->usage = e->usage =
"Usage: memory atexit list {on|off}\n" "Usage: memory atexit list {on|off}\n"
" Enable dumping a list of still allocated memory segments at exit.\n"; " Enable dumping a list of still allocated memory segments at exit.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 3) {
const char * const options[] = { "off", "on", NULL };
return ast_cli_complete(a->word, options, a->n);
}
return NULL; return NULL;
} }
@ -739,7 +734,7 @@ static char *handle_memory_atexit_summary(struct ast_cli_entry *e, int cmd, stru
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "memory atexit summary"; e->command = "memory atexit summary {off|byline|byfunc|byfile}";
e->usage = e->usage =
"Usage: memory atexit summary {off|byline|byfunc|byfile}\n" "Usage: memory atexit summary {off|byline|byfunc|byfile}\n"
" Summary of still allocated memory segments at exit options.\n" " Summary of still allocated memory segments at exit options.\n"
@ -751,11 +746,6 @@ static char *handle_memory_atexit_summary(struct ast_cli_entry *e, int cmd, stru
" Note: byline, byfunc, and byfile are cumulative enables.\n"; " Note: byline, byfunc, and byfile are cumulative enables.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 3) {
const char * const options[] = { "off", "byline", "byfunc", "byfile", NULL };
return ast_cli_complete(a->word, options, a->n);
}
return NULL; return NULL;
} }
@ -1054,7 +1044,7 @@ static char *handle_memory_backtrace(struct ast_cli_entry *e, int cmd, struct as
{ {
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "memory backtrace"; e->command = "memory backtrace {on|off}";
e->usage = e->usage =
"Usage: memory backtrace {on|off}\n" "Usage: memory backtrace {on|off}\n"
" Enable dumping an allocation backtrace with memory diagnostics.\n" " Enable dumping an allocation backtrace with memory diagnostics.\n"
@ -1062,11 +1052,6 @@ static char *handle_memory_backtrace(struct ast_cli_entry *e, int cmd, struct as
" can be CPU intensive.\n"; " can be CPU intensive.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 2) {
const char * const options[] = { "off", "on", NULL };
return ast_cli_complete(a->word, options, a->n);
}
return NULL; return NULL;
} }

14
main/bridge.c
Unescape View File

@ -5170,12 +5170,6 @@ static char *complete_bridge_participant(const char *bridge_name, const char *li
return NULL; return NULL;
} }
if (!state) {
ao2_ref(bridge, -1);
return ast_strdup("all");
}
state--;
{ {
SCOPED_LOCK(bridge_lock, bridge, ast_bridge_lock, ast_bridge_unlock); SCOPED_LOCK(bridge_lock, bridge, ast_bridge_lock, ast_bridge_unlock);
@ -5197,6 +5191,8 @@ static char *complete_bridge_participant(const char *bridge_name, const char *li
static char *handle_bridge_kick_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_bridge_kick_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
static const char * const completions[] = { "all", NULL };
char *complete;
struct ast_bridge *bridge; struct ast_bridge *bridge;
switch (cmd) { switch (cmd) {
@ -5213,7 +5209,11 @@ static char *handle_bridge_kick_channel(struct ast_cli_entry *e, int cmd, struct
return complete_bridge_live(a->word, a->n); return complete_bridge_live(a->word, a->n);
} }
if (a->pos == 3) { if (a->pos == 3) {
return complete_bridge_participant(a->argv[2], a->line, a->word, a->pos, a->n); complete = ast_cli_complete(a->word, completions, a->n);
if (!complete) {
complete = complete_bridge_participant(a->argv[2], a->line, a->word, a->pos, a->n - 1);
}
return complete;
} }
return NULL; return NULL;
} }

9
main/ccss.c
Unescape View File

@ -4572,11 +4572,9 @@ static char *complete_core_id(const char *line, const char *word, int pos, int s
static char *handle_cc_kill(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_cc_kill(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
static const char * const option[] = { "core", "all", NULL };
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
e->command = "cc cancel"; e->command = "cc cancel [core|all]";
e->usage = e->usage =
"Usage: cc cancel can be used in two ways.\n" "Usage: cc cancel can be used in two ways.\n"
" 1. 'cc cancel core [core ID]' will cancel the CC transaction with\n" " 1. 'cc cancel core [core ID]' will cancel the CC transaction with\n"
@ -4584,10 +4582,7 @@ static char *handle_cc_kill(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
" 2. 'cc cancel all' will cancel all active CC transactions.\n"; " 2. 'cc cancel all' will cancel all active CC transactions.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos == 2) { if (a->pos == 3 && !strcasecmp(a->argv[2], "core")) {
return ast_cli_complete(a->word, option, a->n);
}
if (a->pos == 3) {
return complete_core_id(a->line, a->word, a->pos, a->n); return complete_core_id(a->line, a->word, a->pos, a->n);
} }
return NULL; return NULL;

33
main/cli.c
Unescape View File

@ -917,6 +917,7 @@ static char *handle_modlist(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
static char *handle_showcalls(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_showcalls(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
static const char * const completions[] = { "seconds", NULL };
struct timeval curtime = ast_tvnow(); struct timeval curtime = ast_tvnow();
int showuptime, printsec; int showuptime, printsec;
@ -924,7 +925,7 @@ static char *handle_showcalls(struct ast_cli_entry *e, int cmd, struct ast_cli_a
case CLI_INIT: case CLI_INIT:
e->command = "core show calls [uptime]"; e->command = "core show calls [uptime]";
e->usage = e->usage =
"Usage: core show calls [uptime] [seconds]\n" "Usage: core show calls [uptime [seconds]]\n"
" Lists number of currently active calls and total number of calls\n" " Lists number of currently active calls and total number of calls\n"
" processed through PBX since last restart. If 'uptime' is specified\n" " processed through PBX since last restart. If 'uptime' is specified\n"
" the system uptime is also displayed. If 'seconds' is specified in\n" " the system uptime is also displayed. If 'seconds' is specified in\n"
@ -934,7 +935,7 @@ static char *handle_showcalls(struct ast_cli_entry *e, int cmd, struct ast_cli_a
case CLI_GENERATE: case CLI_GENERATE:
if (a->pos != e->args) if (a->pos != e->args)
return NULL; return NULL;
return a->n == 0 ? ast_strdup("seconds") : NULL; return ast_cli_complete(a->word, completions, a->n);
} }
/* regular handler */ /* regular handler */
@ -1104,7 +1105,9 @@ static char *handle_chanlist(struct ast_cli_entry *e, int cmd, struct ast_cli_ar
static char *handle_softhangup(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_softhangup(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct ast_channel *c=NULL; struct ast_channel *c = NULL;
static const char * const completions[] = { "all", NULL };
char *complete;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@ -1117,7 +1120,14 @@ static char *handle_softhangup(struct ast_cli_entry *e, int cmd, struct ast_cli_
" will see the hangup request.\n"; " will see the hangup request.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return ast_complete_channels(a->line, a->word, a->pos, a->n, e->args); if (a->pos != e->args) {
return NULL;
}
complete = ast_cli_complete(a->word, completions, a->n);
if (!complete) {
complete = ast_complete_channels(a->line, a->word, a->pos, a->n - 1, e->args);
}
return complete;
} }
if (a->argc != 4) { if (a->argc != 4) {
@ -1429,6 +1439,8 @@ static int channel_set_debug(void *obj, void *arg, void *data, int flags)
static char *handle_core_set_debug_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_core_set_debug_channel(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct ast_channel *c = NULL; struct ast_channel *c = NULL;
static const char * const completions_all[] = { "all", NULL };
static const char * const completions_off[] = { "off", NULL };
struct channel_set_debug_args args = { struct channel_set_debug_args args = {
.fd = a->fd, .fd = a->fd,
}; };
@ -1441,10 +1453,15 @@ static char *handle_core_set_debug_channel(struct ast_cli_entry *e, int cmd, str
" Enables/disables debugging on all or on a specific channel.\n"; " Enables/disables debugging on all or on a specific channel.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
/* XXX remember to handle the optional "off" */ if (a->pos == 4) {
if (a->pos != e->args) char *complete = ast_cli_complete(a->word, completions_all, a->n);
return NULL; if (!complete) {
return a->n == 0 ? ast_strdup("all") : ast_complete_channels(a->line, a->word, a->pos, a->n - 1, e->args); complete = ast_complete_channels(a->line, a->word, a->pos, a->n - 1, e->args);
}
return complete;
} else if (a->pos == 5) {
return ast_cli_complete(a->word, completions_off, a->n);
}
} }
if (cmd == (CLI_HANDLER + 1000)) { if (cmd == (CLI_HANDLER + 1000)) {

3
main/pbx_app.c
Unescape View File

@ -315,7 +315,6 @@ static char *handle_show_applications(struct ast_cli_entry *e, int cmd, struct a
int like = 0, describing = 0; int like = 0, describing = 0;
int total_match = 0; /* Number of matches in like clause */ int total_match = 0; /* Number of matches in like clause */
int total_apps = 0; /* Number of apps registered */ int total_apps = 0; /* Number of apps registered */
static const char * const choices[] = { "like", "describing", NULL };
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@ -327,7 +326,7 @@ static char *handle_show_applications(struct ast_cli_entry *e, int cmd, struct a
" If 'describing', <text> will be a substring of the description\n"; " If 'describing', <text> will be a substring of the description\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return (a->pos != 3) ? NULL : ast_cli_complete(a->word, choices, a->n); return NULL;
} }
AST_RWLIST_RDLOCK(&apps); AST_RWLIST_RDLOCK(&apps);

2
main/pbx_hangup_handler.c
Unescape View File

@ -260,7 +260,7 @@ static char *handle_show_hangup_all(struct ast_cli_entry *e, int cmd, struct ast
" Show hangup handlers for all channels.\n"; " Show hangup handlers for all channels.\n";
return NULL; return NULL;
case CLI_GENERATE: case CLI_GENERATE:
return ast_complete_channels(a->line, a->word, a->pos, a->n, e->args); return NULL;
} }
if (a->argc < 4) { if (a->argc < 4) {

14
res/res_sorcery_memory_cache.c
Unescape View File

@ -1866,6 +1866,7 @@ static char *sorcery_memory_cache_expire(struct ast_cli_entry *e, int cmd, struc
static char *sorcery_memory_cache_stale(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *sorcery_memory_cache_stale(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct sorcery_memory_cache *cache; struct sorcery_memory_cache *cache;
int reload = 0;
switch (cmd) { switch (cmd) {
case CLI_INIT: case CLI_INIT:
@ -1881,6 +1882,9 @@ static char *sorcery_memory_cache_stale(struct ast_cli_entry *e, int cmd, struct
return sorcery_memory_cache_complete_name(a->word, a->n); return sorcery_memory_cache_complete_name(a->word, a->n);
} else if (a->pos == 5) { } else if (a->pos == 5) {
return sorcery_memory_cache_complete_object_name(a->argv[4], a->word, a->n); return sorcery_memory_cache_complete_object_name(a->argv[4], a->word, a->n);
} else if (a->pos == 6) {
static const char * const completions[] = { "reload", NULL };
return ast_cli_complete(a->word, completions, a->n);
} else { } else {
return NULL; return NULL;
} }
@ -1890,6 +1894,14 @@ static char *sorcery_memory_cache_stale(struct ast_cli_entry *e, int cmd, struct
return CLI_SHOWUSAGE; return CLI_SHOWUSAGE;
} }
if (a->argc == 7) {
if (!strcasecmp(a->argv[6], "reload")) {
reload = 1;
} else {
return CLI_SHOWUSAGE;
}
}
cache = ao2_find(caches, a->argv[4], OBJ_SEARCH_KEY); cache = ao2_find(caches, a->argv[4], OBJ_SEARCH_KEY);
if (!cache) { if (!cache) {
ast_cli(a->fd, "Specified sorcery memory cache '%s' does not exist\n", a->argv[4]); ast_cli(a->fd, "Specified sorcery memory cache '%s' does not exist\n", a->argv[4]);
@ -1910,7 +1922,7 @@ static char *sorcery_memory_cache_stale(struct ast_cli_entry *e, int cmd, struct
if (!mark_object_as_stale_in_cache(cache, a->argv[5])) { if (!mark_object_as_stale_in_cache(cache, a->argv[5])) {
ast_cli(a->fd, "Successfully marked object '%s' in memory cache '%s' as stale\n", ast_cli(a->fd, "Successfully marked object '%s' in memory cache '%s' as stale\n",
a->argv[5], a->argv[4]); a->argv[5], a->argv[4]);
if (a->argc == 7 && ast_true(a->argv[6])) { if (reload) {
struct sorcery_memory_cached_object *cached; struct sorcery_memory_cached_object *cached;
cached = ao2_find(cache->objects, a->argv[5], OBJ_SEARCH_KEY | OBJ_NOLOCK); cached = ao2_find(cache->objects, a->argv[5], OBJ_SEARCH_KEY | OBJ_NOLOCK);

Write Preview
Loading…
Cancel
Save