[asterisk-commits] mvanbaak: branch group/cli_cleanup r145036 - in /team/group/cli_cleanup: apps...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Sep 28 12:25:57 CDT 2008
Author: mvanbaak
Date: Sun Sep 28 12:25:56 2008
New Revision: 145036
URL: http://svn.digium.com/view/asterisk?view=rev&rev=145036
Log:
More CLI updates based on the second Audit from leif.
Junky is going to do the ulimit one, which is the last one
on this list with a remark.
Modified:
team/group/cli_cleanup/apps/app_meetme.c
team/group/cli_cleanup/apps/app_mixmonitor.c
team/group/cli_cleanup/channels/chan_console.c
team/group/cli_cleanup/channels/chan_oss.c
team/group/cli_cleanup/doc/cli_all_cmd.txt
team/group/cli_cleanup/main/astobj2.c
team/group/cli_cleanup/main/taskprocessor.c
Modified: team/group/cli_cleanup/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/apps/app_meetme.c?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/apps/app_meetme.c (original)
+++ team/group/cli_cleanup/apps/app_meetme.c Sun Sep 28 12:25:56 2008
@@ -960,7 +960,7 @@
switch (cmd) {
case CLI_INIT:
- e->command = "meetme";
+ e->command = "meetme {lock|unlock|mute|unmute|kick|list} [concise] <confno> <username>";
e->usage =
"Usage: meetme (un)lock|(un)mute|kick|list [concise] <confno> <usernumber>\n"
" Executes a command for the conference or on a conferee\n";
Modified: team/group/cli_cleanup/apps/app_mixmonitor.c
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/apps/app_mixmonitor.c?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/apps/app_mixmonitor.c (original)
+++ team/group/cli_cleanup/apps/app_mixmonitor.c Sun Sep 28 12:25:56 2008
@@ -365,7 +365,7 @@
switch (cmd) {
case CLI_INIT:
- e->command = "mixmonitor {start|stop} {chan_name} [args]";
+ e->command = "mixmonitor {start|stop} {<chan_name>} [args]";
e->usage =
"Usage: mixmonitor <start|stop> <chan_name> [args]\n"
" The optional arguments are passed to the MixMonitor\n"
Modified: team/group/cli_cleanup/channels/chan_console.c
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/channels/chan_console.c?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/channels/chan_console.c (original)
+++ team/group/cli_cleanup/channels/chan_console.c Sun Sep 28 12:25:56 2008
@@ -1154,12 +1154,10 @@
switch (cmd) {
case CLI_INIT:
- e->command = "console active";
+ e->command = "console {set|show} active [<device>]";
e->usage =
- "Usage: console active [device]\n"
- " If no device is specified. The active console device will be shown.\n"
- "Otherwise, the specified device will become the console device active for\n"
- "the Asterisk CLI.\n";
+ "Usage: console {set|show} active [<device>]\n"
+ " Set or show the active console device for the Asterisk CLI.\n";
return NULL;
case CLI_GENERATE:
if (a->pos == e->args) {
@@ -1181,7 +1179,7 @@
if (a->argc < e->args)
return CLI_SHOWUSAGE;
- if (a->argc == e->args) {
+ if (a->argc == 3) {
pvt = get_active_pvt();
if (!pvt)
Modified: team/group/cli_cleanup/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/channels/chan_oss.c?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/channels/chan_oss.c (original)
+++ team/group/cli_cleanup/channels/chan_oss.c Sun Sep 28 12:25:56 2008
@@ -911,9 +911,9 @@
switch (cmd) {
case CLI_INIT:
- e->command = "console autoanswer [on|off]";
+ e->command = "console set autoanswer [on|off]";
e->usage =
- "Usage: console autoanswer [on|off]\n"
+ "Usage: console set autoanswer [on|off]\n"
" Enables or disables autoanswer feature. If used without\n"
" argument, displays the current on/off status of autoanswer.\n"
" The default value of autoanswer is in 'oss.conf'.\n";
@@ -1200,7 +1200,7 @@
{
switch (cmd) {
case CLI_INIT:
- e->command = "console active";
+ e->command = "console {set|show} active [<device>]";
e->usage =
"Usage: console active [device]\n"
" If used without a parameter, displays which device is the current\n"
@@ -1211,20 +1211,20 @@
return NULL;
}
- if (a->argc == 2)
+ if (a->argc == 3)
ast_cli(a->fd, "active console is [%s]\n", oss_active);
- else if (a->argc != 3)
+ else if (a->argc != 4)
return CLI_SHOWUSAGE;
else {
struct chan_oss_pvt *o;
- if (strcmp(a->argv[2], "show") == 0) {
+ if (strcmp(a->argv[3], "show") == 0) {
for (o = oss_default.next; o; o = o->next)
ast_cli(a->fd, "device [%s] exists\n", o->name);
return CLI_SUCCESS;
}
- o = find_desc(a->argv[2]);
+ o = find_desc(a->argv[3]);
if (o == NULL)
- ast_cli(a->fd, "No device [%s] exists\n", a->argv[2]);
+ ast_cli(a->fd, "No device [%s] exists\n", a->argv[3]);
else
oss_active = o->name;
}
Modified: team/group/cli_cleanup/doc/cli_all_cmd.txt
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/doc/cli_all_cmd.txt?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/doc/cli_all_cmd.txt (original)
+++ team/group/cli_cleanup/doc/cli_all_cmd.txt Sun Sep 28 12:25:56 2008
@@ -13,9 +13,9 @@
agi exec
agi set debug [on|off]
agi show commands [topic]
-ais clm show members --> clm?
+ais clm show members --> clm? MVB: This one and the next are cluster/ais specific things. IIRC clm = cluster management and evt = event
ais evt show event channels --> evt? (event?)
-astobj2 stats --> astobj2 show stats ?
+astobj2 show stats
astobj2 test
cdr show status
*cdr status
@@ -24,9 +24,10 @@
channel request hangup
config list
config reload
-console active --> console set active ??
+console set active <device>
+console show active
console answer
-console autoanswer --> console set autoanswer {on|off} ??
+console set autoanswer [on|off]
*console autoanswer [on|off]
console boost
console dial
@@ -82,7 +83,7 @@
core stop gracefully
core stop now
core stop when convenient
-core taskprocessor ping --> core start taskprocesser ping ??
+core taskprocessor ping --> core start taskprocesser ping ?? MVB: I think 'core ping taskprocessor <taskprocessor>'
dahdi destroy channel
dahdi restart
dahdi set dnd
@@ -202,7 +203,7 @@
manager show eventq
manager show user
manager show users
-meetme --> fix so these commands are output
+meetme {lock|unlock|mute|unmute|kick|list} [conci se] <confno> <username>
memory show allocations
memory show summary
mgcp audit endpoint
@@ -237,7 +238,7 @@
misdn show ports stats
misdn show stacks
misdn toggle echocancel
-mixmonitor {start|stop} {chan_name} [args] --> {<chan_name>} ??
+mixmonitor {start|stop} {<chan_name>} [args]
module load
module reload
module show [like]
@@ -251,7 +252,7 @@
parkedcalls show
phoneprov show routes
pri set debug file
-pri set debug {<level>|on|off} span --> pri set debug off == all off?
+pri set debug {<level>|on|off} span --> pri set debug off == all off? MVB: yes, including the file thing
pri show debug
pri show span
pri show spans
Modified: team/group/cli_cleanup/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/main/astobj2.c?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/main/astobj2.c (original)
+++ team/group/cli_cleanup/main/astobj2.c Sun Sep 28 12:25:56 2008
@@ -862,9 +862,9 @@
{
switch (cmd) {
case CLI_INIT:
- e->command = "astobj2 stats";
- e->usage = "Usage: astobj2 stats\n"
- " Show astobj2 stats\n";
+ e->command = "astobj2 show stats";
+ e->usage = "Usage: astobj2 show stats\n"
+ " Show astobj2 show stats\n";
return NULL;
case CLI_GENERATE:
return NULL;
Modified: team/group/cli_cleanup/main/taskprocessor.c
URL: http://svn.digium.com/view/asterisk/team/group/cli_cleanup/main/taskprocessor.c?view=diff&rev=145036&r1=145035&r2=145036
==============================================================================
--- team/group/cli_cleanup/main/taskprocessor.c (original)
+++ team/group/cli_cleanup/main/taskprocessor.c Sun Sep 28 12:25:56 2008
@@ -196,9 +196,9 @@
switch (cmd) {
case CLI_INIT:
- e->command = "core taskprocessor ping";
+ e->command = "core ping taskprocessor";
e->usage =
- "Usage: core taskprocessor ping <taskprocessor>\n"
+ "Usage: core ping taskprocessor <taskprocessor>\n"
" Displays the time required for a task to be processed\n";
return NULL;
case CLI_GENERATE:
More information about the asterisk-commits
mailing list