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

new-style "core show channels"

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-11-15 17:05:55 +00:00
parent db923f638e
commit b588fc320e
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
main/cli.c
View File

@@ -81,13 +81,6 @@ static char help_help[] =
" information on the given command. If called without a\n" " information on the given command. If called without a\n"
" topic, it provides a list of commands.\n"; " topic, it provides a list of commands.\n";
static char chanlist_help[] =
"Usage: core show channels [concise|verbose]\n"
" Lists currently defined channels and some information about them. If\n"
" 'concise' is specified, the format is abridged and in a more easily\n"
" machine parsable format. If 'verbose' is specified, the output includes\n"
" more and longer fields.\n";
static char logger_mute_help[] = static char logger_mute_help[] =
"Usage: logger mute\n" "Usage: logger mute\n"
" Disables logging output to the current console, making it possible to\n" " Disables logging output to the current console, making it possible to\n"
@@ -537,8 +530,7 @@ static char *handle_modlist(struct ast_cli_entry *e, int cmd, struct ast_cli_arg
#undef MODLIST_FORMAT #undef MODLIST_FORMAT
#undef MODLIST_FORMAT2 #undef MODLIST_FORMAT2
/* core show channels [concise|verbose] */ static char *handle_chanlist(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
static int handle_chanlist(int fd, int argc, char *argv[])
{ {
#define FORMAT_STRING "%-20.20s %-20.20s %-7.7s %-30.30s\n" #define FORMAT_STRING "%-20.20s %-20.20s %-7.7s %-30.30s\n"
#define FORMAT_STRING2 "%-20.20s %-20.20s %-7.7s %-30.30s\n" #define FORMAT_STRING2 "%-20.20s %-20.20s %-7.7s %-30.30s\n"
@@ -553,12 +545,38 @@ static int handle_chanlist(int fd, int argc, char *argv[])
int duration; int duration;
int durh, durm, durs; int durh, durm, durs;
int numchans = 0, concise = 0, verbose = 0; int numchans = 0, concise = 0, verbose = 0;
int fd, argc;
char **argv;
concise = (argc == 4 && (!strcasecmp(argv[3],"concise"))); switch (cmd) {
verbose = (argc == 4 && (!strcasecmp(argv[3],"verbose"))); case CLI_INIT:
e->command = "core show channels";
e->usage =
"Usage: core show channels [concise|verbose]\n"
" Lists currently defined channels and some information about them. If\n"
" 'concise' is specified, the format is abridged and in a more easily\n"
" machine parsable format. If 'verbose' is specified, the output includes\n"
" more and longer fields.\n";
return NULL;
if (argc < 3 || argc > 4 || (argc == 4 && !concise && !verbose)) case CLI_GENERATE: {
return RESULT_SHOWUSAGE; static char *choices[] = { "concise", "verbose", NULL };
return (a->pos != e->args) ? NULL : ast_cli_complete(a->word, choices, a->n);
}
}
fd = a->fd;
argc = a->argc;
argv = a->argv;
if (a->argc == e->args + 1) {
if (!strcasecmp(argv[3],"concise"))
concise = 1;
else if (!strcasecmp(argv[3],"verbose"))
verbose = 1;
else
return CLI_SHOWUSAGE;
} else if (a->argc != e->args)
return CLI_SHOWUSAGE;
if (!concise && !verbose) if (!concise && !verbose)
ast_cli(fd, FORMAT_STRING2, "Channel", "Location", "State", "Application(Data)"); ast_cli(fd, FORMAT_STRING2, "Channel", "Location", "State", "Application(Data)");
@@ -621,7 +639,7 @@ static int handle_chanlist(int fd, int argc, char *argv[])
else else
ast_cli(fd, "%d active call%s\n", ast_active_calls(), ESS(ast_active_calls())); ast_cli(fd, "%d active call%s\n", ast_active_calls(), ESS(ast_active_calls()));
} }
return RESULT_SUCCESS; return CLI_SUCCESS;
#undef FORMAT_STRING #undef FORMAT_STRING
#undef FORMAT_STRING2 #undef FORMAT_STRING2
@@ -931,13 +949,6 @@ char *ast_cli_complete(const char *word, char *const choices[], int state)
return NULL; return NULL;
} }
static char *complete_show_channels(const char *line, const char *word, int pos, int state)
{
static char *choices[] = { "concise", "verbose", NULL };
return (pos != 3) ? NULL : ast_cli_complete(word, choices, state);
}
char *ast_complete_channels(const char *line, const char *word, int pos, int state, int rpos) char *ast_complete_channels(const char *line, const char *word, int pos, int state, int rpos)
{ {
struct ast_channel *c = NULL; struct ast_channel *c = NULL;
@@ -1068,9 +1079,7 @@ static struct ast_cli_entry cli_cli[] = {
/* Deprecated, but preferred command is now consolidated (and already has a deprecated command for it). */ /* Deprecated, but preferred command is now consolidated (and already has a deprecated command for it). */
NEW_CLI(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"), NEW_CLI(handle_nodebugchan_deprecated, "Disable debugging on channel(s)"),
{ { "core", "show", "channels", NULL }, NEW_CLI(handle_chanlist, "Display information on channels"),
handle_chanlist, "Display information on channels",
chanlist_help, complete_show_channels },
{ { "core", "show", "channel", NULL }, { { "core", "show", "channel", NULL },
handle_showchan, "Display information on a specific channel", handle_showchan, "Display information on a specific channel",