Merge the cli_cleanup branch.

This work is done by lmadsen, junky and mvanbaak
during AstriDevCon.

This is the second audit the CLI got, and
this time lmadsen made sure he had _ALL_ modules
loaded that have CLI commands in them.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@145121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Michiel van Baak
2008-09-28 23:32:14 +00:00
parent 434c69b7fd
commit 90751b16ca
21 changed files with 233 additions and 283 deletions

View File

@@ -756,18 +756,18 @@ static char *handle_softhangup(struct ast_cli_entry *e, int cmd, struct ast_cli_
switch (cmd) {
case CLI_INIT:
e->command = "soft hangup";
e->command = "channel request hangup";
e->usage =
"Usage: soft hangup <channel>\n"
"Usage: channel request hangup <channel>\n"
" Request that a channel be hung up. The hangup takes effect\n"
" the next time the driver reads or writes from the channel\n";
return NULL;
case CLI_GENERATE:
return ast_complete_channels(a->line, a->word, a->pos, a->n, 2);
}
if (a->argc != 3)
if (a->argc != 4)
return CLI_SHOWUSAGE;
c = ast_get_channel_by_name_locked(a->argv[2]);
c = ast_get_channel_by_name_locked(a->argv[3]);
if (c) {
ast_cli(a->fd, "Requested Hangup on channel '%s'\n", c->name);
ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);