[svn-commits] tilghman: trunk r47052 - in /trunk: ./ apps/
channels/ main/ res/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Nov 2 16:16:09 MST 2006
Author: tilghman
Date: Thu Nov 2 17:16:09 2006
New Revision: 47052
URL: http://svn.digium.com/view/asterisk?rev=47052&view=rev
Log:
Merged revisions 47051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47051 | tilghman | 2006-11-02 17:00:20 -0600 (Thu, 02 Nov 2006) | 2 lines
Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments"
........
Modified:
trunk/ (props changed)
trunk/apps/app_queue.c
trunk/apps/app_voicemail.c
trunk/channels/chan_agent.c
trunk/channels/chan_features.c
trunk/channels/chan_iax2.c
trunk/channels/chan_local.c
trunk/channels/chan_mgcp.c
trunk/channels/chan_sip.c
trunk/channels/chan_skinny.c
trunk/main/asterisk.c
trunk/main/channel.c
trunk/main/cli.c
trunk/main/config.c
trunk/main/file.c
trunk/main/frame.c
trunk/main/http.c
trunk/main/image.c
trunk/main/logger.c
trunk/main/manager.c
trunk/main/pbx.c
trunk/res/res_agi.c
trunk/res/res_crypto.c
trunk/res/res_features.c
trunk/res/res_indications.c
trunk/res/res_musiconhold.c
trunk/res/res_odbc.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Nov 2 17:16:09 2006
@@ -4010,12 +4010,12 @@
return 1;
}
-static int __queues_show(struct mansession *s, int manager, int fd, int argc, char **argv, int queue_show)
+static int __queues_show(struct mansession *s, int manager, int fd, int argc, char **argv)
{
struct call_queue *q;
struct queue_ent *qe;
struct member *mem;
- int pos;
+ int pos, queue_show;
time_t now;
char max_buf[80];
char *max;
@@ -4024,7 +4024,11 @@
char *term = manager ? "\r\n" : "\n";
time(&now);
- if ((!queue_show && argc != 2) || (queue_show && argc != 3))
+ if (argc == 2)
+ queue_show = 0;
+ else if (argc == 3)
+ queue_show = 1;
+ else
return RESULT_SHOWUSAGE;
/* We only want to load realtime queues when a specific queue is asked for. */
@@ -4138,14 +4142,9 @@
return RESULT_SUCCESS;
}
-static int queue_list(int fd, int argc, char **argv)
-{
- return __queues_show(NULL, 0, fd, argc, argv, 0);
-}
-
static int queue_show(int fd, int argc, char **argv)
{
- return __queues_show(NULL, 0, fd, argc, argv, 1);
+ return __queues_show(NULL, 0, fd, argc, argv);
}
static char *complete_queue(const char *line, const char *word, int pos, int state)
@@ -4172,9 +4171,9 @@
*/
static int manager_queues_show( struct mansession *s, struct message *m )
{
- char *a[] = { "queue", "list" };
-
- __queues_show(s, 1, -1, 2, a, 0);
+ char *a[] = { "queue", "show" };
+
+ __queues_show(s, 1, -1, 2, a);
astman_append(s, "\r\n\r\n"); /* Properly terminate Manager output */
return RESULT_SUCCESS;
@@ -4584,10 +4583,6 @@
return NULL;
}
-static char queue_list_usage[] =
-"Usage: queue list\n"
-" Provides summary information on call queues.\n";
-
static char queue_show_usage[] =
"Usage: queue show\n"
" Provides summary information on a specified queue.\n";
@@ -4599,10 +4594,6 @@
"Usage: queue remove member <channel> from <queue>\n";
static struct ast_cli_entry cli_queue[] = {
- { { "queue", "list", NULL },
- queue_list, "Show status of queues",
- queue_list_usage, NULL, NULL },
-
{ { "queue", "show", NULL },
queue_show, "Show status of a specified queue",
queue_show_usage, complete_queue, NULL },
Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Thu Nov 2 17:16:09 2006
@@ -6738,11 +6738,11 @@
}
static char voicemail_show_users_help[] =
-"Usage: voicemail list users [for <context>]\n"
+"Usage: voicemail show users [for <context>]\n"
" Lists all mailboxes currently set up\n";
static char voicemail_show_zones_help[] =
-"Usage: voicemail list zones\n"
+"Usage: voicemail show zones\n"
" Lists zone message formats\n";
static int handle_voicemail_show_users(int fd, int argc, char *argv[])
@@ -6849,11 +6849,11 @@
}
static struct ast_cli_entry cli_voicemail[] = {
- { { "voicemail", "list", "users", NULL },
+ { { "voicemail", "show", "users", NULL },
handle_voicemail_show_users, "List defined voicemail boxes",
voicemail_show_users_help, complete_voicemail_show_users, NULL },
- { { "voicemail", "list", "zones", NULL },
+ { { "voicemail", "show", "zones", NULL },
handle_voicemail_show_zones, "List zone message formats",
voicemail_show_zones_help, NULL, NULL },
};
Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Thu Nov 2 17:16:09 2006
@@ -1720,11 +1720,11 @@
static char show_agents_usage[] =
-"Usage: agent list\n"
+"Usage: agent show\n"
" Provides summary information on agents.\n";
static char show_agents_online_usage[] =
-"Usage: agent list online\n"
+"Usage: agent show online\n"
" Provides a list of all online agents.\n";
static char agent_logoff_usage[] =
@@ -1733,11 +1733,11 @@
" If 'soft' is specified, do not hangup existing calls.\n";
static struct ast_cli_entry cli_agents[] = {
- { { "agent", "list", NULL },
+ { { "agent", "show", NULL },
agents_show, "Show status of agents",
show_agents_usage },
- { { "agent", "list", "online" },
+ { { "agent", "show", "online" },
agents_show_online, "Show all online agents",
show_agents_online_usage },
Modified: trunk/channels/chan_features.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_features.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_features.c (original)
+++ trunk/channels/chan_features.c Thu Nov 2 17:16:09 2006
@@ -531,11 +531,11 @@
}
static char show_features_usage[] =
-"Usage: feature list channels\n"
+"Usage: feature show channels\n"
" Provides summary information on feature channels.\n";
static struct ast_cli_entry cli_features[] = {
- { { "feature", "list", "channels", NULL },
+ { { "feature", "show", "channels", NULL },
features_show, "List status of feature channels",
show_features_usage },
};
Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Thu Nov 2 17:16:09 2006
@@ -4478,7 +4478,7 @@
static int iax2_no_debug(int fd, int argc, char *argv[])
{
- if (argc != 2)
+ if (argc != 3)
return RESULT_SHOWUSAGE;
iaxdebug = 0;
ast_cli(fd, "IAX2 Debugging Disabled\n");
@@ -4487,7 +4487,7 @@
static int iax2_no_trunk_debug(int fd, int argc, char *argv[])
{
- if (argc != 3)
+ if (argc != 4)
return RESULT_SHOWUSAGE;
iaxtrunkdebug = 0;
ast_cli(fd, "IAX2 Trunk Debugging Disabled\n");
@@ -4496,11 +4496,10 @@
static int iax2_no_jb_debug(int fd, int argc, char *argv[])
{
- if (argc != 3)
+ if (argc != 4)
return RESULT_SHOWUSAGE;
- jb_setoutput(jb_error_output, jb_warning_output, NULL);
- jb_debug_output("\n");
- ast_cli(fd, "IAX2 Jitterbuffer Debugging Disabled\n");
+ iaxtrunkdebug = 0;
+ ast_cli(fd, "IAX2 Trunk Debugging Disabled\n");
return RESULT_SUCCESS;
}
@@ -9639,7 +9638,7 @@
};
static char show_stats_usage[] =
-"Usage: iax2 list stats\n"
+"Usage: iax2 show stats\n"
" Display statistics on IAX channel driver.\n";
static char set_mtu_usage[] =
@@ -9650,7 +9649,7 @@
" This is substantially below the IP mtu. Try 1240 on ethernets.\n"
" Must be 172 or greater for G.711 samples.\n";
static char show_cache_usage[] =
-"Usage: iax2 list cache\n"
+"Usage: iax2 show cache\n"
" Display currently cached IAX Dialplan results.\n";
static char show_peer_usage[] =
@@ -9673,34 +9672,34 @@
" fields will be provisioned as empty fields.\n";
static char show_users_usage[] =
-"Usage: iax2 list users [like <pattern>]\n"
+"Usage: iax2 show users [like <pattern>]\n"
" Lists all known IAX2 users.\n"
" Optional regular expression pattern is used to filter the user list.\n";
static char show_channels_usage[] =
-"Usage: iax2 list channels\n"
+"Usage: iax2 show channels\n"
" Lists all currently active IAX channels.\n";
static char show_netstats_usage[] =
-"Usage: iax2 list netstats\n"
+"Usage: iax2 show netstats\n"
" Lists network status for all currently active IAX channels.\n";
static char show_threads_usage[] =
-"Usage: iax2 list threads\n"
+"Usage: iax2 show threads\n"
" Lists status of IAX helper threads\n";
static char show_peers_usage[] =
-"Usage: iax2 list peers [registered] [like <pattern>]\n"
+"Usage: iax2 show peers [registered] [like <pattern>]\n"
" Lists all known IAX2 peers.\n"
" Optional 'registered' argument lists only peers with known addresses.\n"
" Optional regular expression pattern is used to filter the peer list.\n";
static char show_firmware_usage[] =
-"Usage: iax2 list firmware\n"
+"Usage: iax2 show firmware\n"
" Lists all known IAX firmware images.\n";
static char show_reg_usage[] =
-"Usage: iax2 list registry\n"
+"Usage: iax2 show registry\n"
" Lists all registration requests and status.\n";
static char debug_usage[] =
@@ -9746,35 +9745,35 @@
#endif /* IAXTESTS */
static struct ast_cli_entry cli_iax2[] = {
- { { "iax2", "list", "cache", NULL },
+ { { "iax2", "show", "cache", NULL },
iax2_show_cache, "Display IAX cached dialplan",
show_cache_usage },
- { { "iax2", "list", "channels", NULL },
+ { { "iax2", "show", "channels", NULL },
iax2_show_channels, "List active IAX channels",
show_channels_usage },
- { { "iax2", "list", "firmware", NULL },
+ { { "iax2", "show", "firmware", NULL },
iax2_show_firmware, "List available IAX firmwares",
show_firmware_usage },
- { { "iax2", "list", "netstats", NULL },
+ { { "iax2", "show", "netstats", NULL },
iax2_show_netstats, "List active IAX channel netstats",
show_netstats_usage },
- { { "iax2", "list", "peers", NULL },
+ { { "iax2", "show", "peers", NULL },
iax2_show_peers, "List defined IAX peers",
show_peers_usage },
- { { "iax2", "list", "registry", NULL },
+ { { "iax2", "show", "registry", NULL },
iax2_show_registry, "Display IAX registration status",
show_reg_usage },
- { { "iax2", "list", "stats", NULL },
+ { { "iax2", "show", "stats", NULL },
iax2_show_stats, "Display IAX statistics",
show_stats_usage },
- { { "iax2", "list", "threads", NULL },
+ { { "iax2", "show", "threads", NULL },
iax2_show_threads, "Display IAX helper thread info",
show_threads_usage },
@@ -9782,7 +9781,7 @@
iax2_set_mtu, "Set the IAX systemwide trunking MTU",
set_mtu_usage, NULL, NULL },
- { { "iax2", "list", "users", NULL },
+ { { "iax2", "show", "users", NULL },
iax2_show_users, "List defined IAX users",
show_users_usage },
@@ -9810,15 +9809,15 @@
iax2_do_jb_debug, "Enable IAX jitterbuffer debugging",
debug_jb_usage },
- { { "iax2", "nodebug", NULL },
+ { { "iax2", "debug", "off", NULL },
iax2_no_debug, "Disable IAX debugging",
no_debug_usage },
- { { "iax2", "nodebug", "trunk", NULL },
+ { { "iax2", "debug", "trunk", "off", NULL },
iax2_no_trunk_debug, "Disable IAX trunk debugging",
no_debug_trunk_usage },
- { { "iax2", "nodebug", "jb", NULL },
+ { { "iax2", "debug", "jb", "off", NULL },
iax2_no_jb_debug, "Disable IAX jitterbuffer debugging",
no_debug_jb_usage },
Modified: trunk/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_local.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Thu Nov 2 17:16:09 2006
@@ -626,11 +626,11 @@
}
static char show_locals_usage[] =
-"Usage: local list channels\n"
+"Usage: local show channels\n"
" Provides summary information on active local proxy channels.\n";
static struct ast_cli_entry cli_local[] = {
- { { "local", "list", "channels", NULL },
+ { { "local", "show", "channels", NULL },
locals_show, "List status of local channels",
show_locals_usage },
};
Modified: trunk/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_mgcp.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Thu Nov 2 17:16:09 2006
@@ -1045,11 +1045,11 @@
}
static char show_endpoints_usage[] =
-"Usage: mgcp endpoint list\n"
+"Usage: mgcp show endpoints\n"
" Lists all endpoints known to the MGCP (Media Gateway Control Protocol) subsystem.\n";
static char audit_endpoint_usage[] =
-"Usage: mgcp endpoint audit <endpointid>\n"
+"Usage: mgcp audit endpoint <endpointid>\n"
" Lists the capabilities of an endpoint in the MGCP (Media Gateway Control Protocol) subsystem.\n"
" mgcp debug MUST be on to see the results of this command.\n";
@@ -1058,12 +1058,13 @@
" Enables dumping of MGCP packets for debugging purposes\n";
static char no_debug_usage[] =
-"Usage: mgcp nodebug\n"
+"Usage: mgcp debug off\n"
" Disables dumping of MGCP packets for debugging purposes\n";
static char mgcp_reload_usage[] =
"Usage: mgcp reload\n"
-" Reloads MGCP configuration from mgcp.conf\n";
+" Reloads MGCP configuration from mgcp.conf\n"
+" Deprecated: please use 'reload chan_mgcp.so' instead.\n";
static int mgcp_audit_endpoint(int fd, int argc, char *argv[])
{
@@ -1129,7 +1130,7 @@
static int mgcp_no_debug(int fd, int argc, char *argv[])
{
- if (argc != 2)
+ if (argc != 3)
return RESULT_SHOWUSAGE;
mgcpdebug = 0;
ast_cli(fd, "MGCP Debugging Disabled\n");
@@ -1137,11 +1138,11 @@
}
static struct ast_cli_entry cli_mgcp[] = {
- { { "mgcp", "endpoint", "audit", NULL },
+ { { "mgcp", "audit", "endpoint", NULL },
mgcp_audit_endpoint, "Audit specified MGCP endpoint",
audit_endpoint_usage },
- { { "mgcp", "endpoint", "list", NULL },
+ { { "mgcp", "show", "endpoints", NULL },
mgcp_show_endpoints, "List defined MGCP endpoints",
show_endpoints_usage },
@@ -1149,7 +1150,7 @@
mgcp_do_debug, "Enable MGCP debugging",
debug_usage },
- { { "mgcp", "nodebug", NULL },
+ { { "mgcp", "debug", "off", NULL },
mgcp_no_debug, "Disable MGCP debugging",
no_debug_usage },
@@ -4296,6 +4297,12 @@
static int mgcp_reload(int fd, int argc, char *argv[])
{
+ static int deprecated = 0;
+ if (!deprecated && argc > 0) {
+ ast_log(LOG_WARNING, "'mgcp reload' is deprecated. Please use 'reload chan_mgcp.so' instead.\n");
+ deprecated = 1;
+ }
+
ast_mutex_lock(&mgcp_reload_lock);
if (mgcp_reloading) {
ast_verbose("Previous mgcp reload not yet done\n");
Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Nov 2 17:16:09 2006
@@ -10929,7 +10929,7 @@
/*! \brief Disable SIP Debugging in CLI */
static int sip_no_debug(int fd, int argc, char *argv[])
{
- if (argc != 2)
+ if (argc != 3)
return RESULT_SHOWUSAGE;
ast_clear_flag(&global_flags[1], SIP_PAGE2_DEBUG_CONSOLE);
ast_cli(fd, "SIP Debugging Disabled\n");
@@ -10950,7 +10950,7 @@
/*! \brief Disable SIP History logging (CLI) */
static int sip_no_history(int fd, int argc, char *argv[])
{
- if (argc != 2) {
+ if (argc != 3) {
return RESULT_SHOWUSAGE;
}
recordhistory = FALSE;
@@ -11151,7 +11151,7 @@
}
static char show_domains_usage[] =
-"Usage: sip list domains\n"
+"Usage: sip show domains\n"
" Lists all configured SIP local domains.\n"
" Asterisk only responds to SIP messages to local domains.\n";
@@ -11161,7 +11161,7 @@
" Message types are defined in sip_notify.conf\n";
static char show_users_usage[] =
-"Usage: sip list users [like <pattern>]\n"
+"Usage: sip show users [like <pattern>]\n"
" Lists all known SIP users.\n"
" Optional regular expression pattern is used to filter the user list.\n";
@@ -11171,12 +11171,12 @@
" Option \"load\" forces lookup of peer in realtime storage.\n";
static char show_inuse_usage[] =
-"Usage: sip list inuse [all]\n"
+"Usage: sip show inuse [all]\n"
" List all SIP users and peers usage counters and limits.\n"
" Add option \"all\" to show all devices, not only those with a limit.\n";
static char show_channels_usage[] =
-"Usage: sip list channels\n"
+"Usage: sip show channels\n"
" Lists all currently active SIP channels.\n";
static char show_channel_usage[] =
@@ -11188,7 +11188,7 @@
" Provides detailed dialog history on a given SIP channel.\n";
static char show_peers_usage[] =
-"Usage: sip list peers [like <pattern>]\n"
+"Usage: sip show peers [like <pattern>]\n"
" Lists all known SIP peers.\n"
" Optional regular expression pattern is used to filter the peer list.\n";
@@ -11203,7 +11203,7 @@
" Optional regular expression pattern is used to filter the objects.\n";
static char show_reg_usage[] =
-"Usage: sip list registry\n"
+"Usage: sip show registry\n"
" Lists all registration requests and status.\n";
static char debug_usage[] =
@@ -11216,11 +11216,11 @@
" Require peer to be registered.\n";
static char no_debug_usage[] =
-"Usage: sip nodebug\n"
+"Usage: sip debug off\n"
" Disables dumping of SIP packets for debugging purposes\n";
static char no_history_usage[] =
-"Usage: sip nohistory\n"
+"Usage: sip history off\n"
" Disables recording of SIP dialog history for debugging purposes\n";
static char history_usage[] =
@@ -11230,18 +11230,19 @@
static char sip_reload_usage[] =
"Usage: sip reload\n"
-" Reloads SIP configuration from sip.conf\n";
+" Reloads SIP configuration from sip.conf\n"
+" Deprecated: please use 'reload chan_sip.so'\n";
static char show_subscriptions_usage[] =
-"Usage: sip list subscriptions\n"
+"Usage: sip show subscriptions\n"
" Lists active SIP subscriptions for extension states\n";
static char show_objects_usage[] =
-"Usage: sip list objects\n"
+"Usage: sip show objects\n"
" Lists status of known SIP objects\n";
static char show_settings_usage[] =
-"Usage: sip list settings\n"
+"Usage: sip show settings\n"
" Provides detailed list of the configuration of the SIP channel.\n";
/*! \brief Read SIP header (dialplan function) */
@@ -16954,6 +16955,11 @@
/*! \brief Force reload of module from cli */
static int sip_reload(int fd, int argc, char *argv[])
{
+ static int deprecated = 0;
+ if (!deprecated && argc > 0) {
+ ast_log(LOG_WARNING, "\"sip reload\" is deprecated. Please use 'reload chan_sip.so' instead.\n");
+ deprecated = 1;
+ }
ast_mutex_lock(&sip_reload_lock);
if (sip_reloading)
@@ -16979,39 +16985,39 @@
/*! \brief SIP Cli commands definition */
static struct ast_cli_entry cli_sip[] = {
- { { "sip", "list", "channels", NULL },
+ { { "sip", "show", "channels", NULL },
sip_show_channels, "List active SIP channels",
show_channels_usage },
- { { "sip", "list", "domains", NULL },
+ { { "sip", "show", "domains", NULL },
sip_show_domains, "List our local SIP domains.",
show_domains_usage },
- { { "sip", "list", "inuse", NULL },
+ { { "sip", "show", "inuse", NULL },
sip_show_inuse, "List all inuse/limits",
show_inuse_usage },
- { { "sip", "list", "objects", NULL },
+ { { "sip", "show", "objects", NULL },
sip_show_objects, "List all SIP object allocations",
show_objects_usage },
- { { "sip", "list", "peers", NULL },
+ { { "sip", "show", "peers", NULL },
sip_show_peers, "List defined SIP peers",
show_peers_usage },
- { { "sip", "list", "registry", NULL },
+ { { "sip", "show", "registry", NULL },
sip_show_registry, "List SIP registration status",
show_reg_usage },
{ { "sip", "show", "settings", NULL },
- sip_show_settings, "List SIP global settings",
+ sip_show_settings, "Show SIP global settings",
show_settings_usage },
- { { "sip", "list", "subscriptions", NULL },
+ { { "sip", "show", "subscriptions", NULL },
sip_show_subscriptions, "List active SIP subscriptions",
show_subscriptions_usage },
- { { "sip", "list", "users", NULL },
+ { { "sip", "show", "users", NULL },
sip_show_users, "List defined SIP users",
show_users_usage },
@@ -17059,7 +17065,7 @@
sip_do_debug, "Enable SIP debugging on Peername",
debug_usage, complete_sip_debug_peer },
- { { "sip", "nodebug", NULL },
+ { { "sip", "debug", "off", NULL },
sip_no_debug, "Disable SIP debugging",
no_debug_usage },
@@ -17067,7 +17073,7 @@
sip_do_history, "Enable SIP history",
history_usage },
- { { "sip", "nohistory", NULL },
+ { { "sip", "history", "off", NULL },
sip_no_history, "Disable SIP history",
no_history_usage },
Modified: trunk/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_skinny.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Thu Nov 2 17:16:09 2006
@@ -1750,7 +1750,7 @@
static int skinny_do_debug(int fd, int argc, char *argv[])
{
- if (argc != 2) {
+ if (argc != 3) {
return RESULT_SHOWUSAGE;
}
skinnydebug = 1;
@@ -1760,7 +1760,7 @@
static int skinny_no_debug(int fd, int argc, char *argv[])
{
- if (argc != 2) {
+ if (argc != 3) {
return RESULT_SHOWUSAGE;
}
skinnydebug = 0;
@@ -1949,11 +1949,11 @@
}
static char show_devices_usage[] =
-"Usage: skinny list devices\n"
+"Usage: skinny show devices\n"
" Lists all devices known to the Skinny subsystem.\n";
static char show_lines_usage[] =
-"Usage: skinny list lines\n"
+"Usage: skinny show lines\n"
" Lists all lines known to the Skinny subsystem.\n";
static char debug_usage[] =
@@ -1961,7 +1961,7 @@
" Enables dumping of Skinny packets for debugging purposes\n";
static char no_debug_usage[] =
-"Usage: skinny nodebug\n"
+"Usage: skinny no debug\n"
" Disables dumping of Skinny packets for debugging purposes\n";
static char reset_usage[] =
@@ -1969,11 +1969,11 @@
" Causes a Skinny device to reset itself, optionally with a full restart\n";
static struct ast_cli_entry cli_skinny[] = {
- { { "skinny", "list", "devices", NULL },
+ { { "skinny", "show", "devices", NULL },
skinny_show_devices, "List defined Skinny devices",
show_devices_usage },
- { { "skinny", "list", "lines", NULL },
+ { { "skinny", "show", "lines", NULL },
skinny_show_lines, "List defined Skinny lines per device",
show_lines_usage },
@@ -1981,7 +1981,7 @@
skinny_do_debug, "Enable Skinny debugging",
debug_usage },
- { { "skinny", "nodebug", NULL },
+ { { "skinny", "no", "debug", NULL },
skinny_no_debug, "Disable Skinny debugging",
no_debug_usage },
Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Thu Nov 2 17:16:09 2006
@@ -138,10 +138,10 @@
#define WELCOME_MESSAGE \
ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \
ast_verbose("Created by Mark Spencer <markster at digium.com>\n"); \
- ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'show warranty' for details.\n"); \
+ ast_verbose("Asterisk comes with ABSOLUTELY NO WARRANTY; type 'core show warranty' for details.\n"); \
ast_verbose("This is free software, with components licensed under the GNU General Public\n"); \
ast_verbose("License version 2 and other licenses; you are welcome to redistribute it under\n"); \
- ast_verbose("certain conditions. Type 'show license' for details.\n"); \
+ ast_verbose("certain conditions. Type 'core show license' for details.\n"); \
ast_verbose("=========================================================================\n")
/*! \defgroup main_options Main Configuration Options
@@ -290,7 +290,7 @@
static AST_LIST_HEAD_STATIC(thread_list, thread_list_t);
static char show_threads_help[] =
-"Usage: show threads\n"
+"Usage: core show threads\n"
" List threads currently active in the system.\n";
void ast_register_thread(char *name)
@@ -484,7 +484,7 @@
}
static char show_version_files_help[] =
-"Usage: file list version [like <pattern>]\n"
+"Usage: core show file version [like <pattern>]\n"
" Lists the revision numbers of the files used to build this copy of Asterisk.\n"
" Optional regular expression pattern is used to filter the file list.\n";
@@ -1310,15 +1310,15 @@
" Executes a given shell command\n";
static char show_warranty_help[] =
-"Usage: show warranty\n"
+"Usage: core show warranty\n"
" Shows the warranty (if any) for this copy of Asterisk.\n";
static char show_license_help[] =
-"Usage: show license\n"
+"Usage: core show license\n"
" Shows the license(s) for this copy of Asterisk.\n";
static char version_help[] =
-"Usage: show version\n"
+"Usage: core show version\n"
" Shows Asterisk version information.\n";
static int handle_version(int fd, int argc, char *argv[])
@@ -1500,15 +1500,15 @@
handle_restart_when_convenient, "Restart Asterisk at empty call volume",
restart_when_convenient_help },
- { { "show", "warranty", NULL },
+ { { "core", "show", "warranty", NULL },
show_warranty, "Show the warranty (if any) for this copy of Asterisk",
show_warranty_help },
- { { "show", "license", NULL },
+ { { "core", "show", "license", NULL },
show_license, "Show the license(s) for this copy of Asterisk",
show_license_help },
- { { "show", "version", NULL },
+ { { "core", "show", "version", NULL },
handle_version, "Display version info",
version_help },
@@ -1517,19 +1517,19 @@
bang_help },
#if !defined(LOW_MEMORY)
- { { "file", "list", "version", NULL },
+ { { "core", "show", "file", "version", NULL },
handle_show_version_files, "List versions of files used to build Asterisk",
show_version_files_help, complete_show_version_files },
- { { "show", "threads", NULL },
+ { { "core", "show", "threads", NULL },
handle_show_threads, "Show running threads",
show_threads_help },
- { { "profile", "list", NULL },
+ { { "core", "show", "profile", NULL },
handle_show_profile, "Display profiling info",
NULL },
- { { "profile", "clear", NULL },
+ { { "core", "clear", "profile", NULL },
handle_show_profile, "Clear profiling info",
NULL },
#endif /* ! LOW_MEMORY */
Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Nov 2 17:16:09 2006
@@ -289,19 +289,19 @@
}
static char show_channeltypes_usage[] =
-"Usage: channeltype list\n"
+"Usage: core show channeltypes\n"
" Lists available channel types registered in your Asterisk server.\n";
static char show_channeltype_usage[] =
-"Usage: channeltype show <name>\n"
+"Usage: core show channeltype <name>\n"
" Show details about the specified channel type, <name>.\n";
static struct ast_cli_entry cli_channel[] = {
- { { "channeltype", "list", NULL },
+ { { "core", "show", "channeltypes", NULL },
show_channeltypes, "List available channel types",
show_channeltypes_usage },
- { { "channeltype", "show", NULL },
+ { { "core", "show", "channeltype", NULL },
show_channeltype, "Give more details on that channel type",
show_channeltype_usage, complete_channeltypes },
};
Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Thu Nov 2 17:16:09 2006
@@ -76,11 +76,11 @@
static AST_LIST_HEAD_STATIC(helpers, ast_cli_entry);
static char load_help[] =
-"Usage: module load <module name>\n"
+"Usage: load <module name>\n"
" Loads the specified module into Asterisk.\n";
static char unload_help[] =
-"Usage: module unload [-f|-h] <module name>\n"
+"Usage: unload [-f|-h] <module name>\n"
" Unloads the specified module from Asterisk. The -f\n"
" option causes the module to be unloaded even if it is\n"
" in use (may cause a crash) and the -h module causes the\n"
@@ -94,32 +94,32 @@
" topic, it provides a list of commands.\n";
static char chanlist_help[] =
-"Usage: channel list [concise|verbose]\n"
+"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 reload_help[] =
-"Usage: module reload [module ...]\n"
+"Usage: reload [module ...]\n"
" Reloads configuration files for all listed modules which support\n"
" reloading, or for all supported modules if none are listed.\n";
static char verbose_help[] =
-"Usage: core verbose <level>\n"
+"Usage: core set verbose <level>\n"
" Sets level of verbose messages to be displayed. 0 means\n"
" no messages should be displayed. Equivalent to -v[v[v...]]\n"
" on startup\n";
static char debug_help[] =
-"Usage: core debug <level> [filename]\n"
+"Usage: core set debug <level> [filename]\n"
" Sets level of core debug messages to be displayed. 0 means\n"
" no messages should be displayed. Equivalent to -d[d[d...]]\n"
" on startup. If filename is specified, debugging will be\n"
" limited to just that file.\n";
static char nodebug_help[] =
-"Usage: core nodebug\n"
+"Usage: core set no debug\n"
" Turns off core debug messages.\n";
static char logger_mute_help[] =
@@ -133,17 +133,17 @@
" the next time the driver reads or writes from the channel\n";
static char group_show_channels_help[] =
-"Usage: group list channels [pattern]\n"
+"Usage: group show channels [pattern]\n"
" Lists all currently active channels with channel group(s) specified.\n"
" Optional regular expression pattern is matched to group names for each\n"
" channel.\n";
static int handle_load(int fd, int argc, char *argv[])
{
- if (argc != 3)
- return RESULT_SHOWUSAGE;
- if (ast_load_resource(argv[2])) {
- ast_cli(fd, "Unable to load module %s\n", argv[2]);
+ if (argc != 2)
+ return RESULT_SHOWUSAGE;
+ if (ast_load_resource(argv[1])) {
+ ast_cli(fd, "Unable to load module %s\n", argv[1]);
return RESULT_FAILURE;
}
return RESULT_SUCCESS;
@@ -153,10 +153,10 @@
{
int x;
int res;
- if (argc < 2)
- return RESULT_SHOWUSAGE;
- if (argc > 2) {
- for (x=2;x<argc;x++) {
+ if (argc < 1)
+ return RESULT_SHOWUSAGE;
+ if (argc > 1) {
+ for (x=1;x<argc;x++) {
res = ast_module_reload(argv[x]);
switch(res) {
case 0:
@@ -300,9 +300,9 @@
{
int x;
int force=AST_FORCE_SOFT;
- if (argc < 3)
- return RESULT_SHOWUSAGE;
- for (x=2;x<argc;x++) {
+ if (argc < 2)
+ return RESULT_SHOWUSAGE;
+ for (x=1;x<argc;x++) {
if (argv[x][0] == '-') {
switch(argv[x][1]) {
case 'f':
@@ -341,11 +341,11 @@
}
static char modlist_help[] =
-"Usage: module list [like keyword]\n"
+"Usage: core show modules [like keyword]\n"
" Shows Asterisk modules currently in use, and usage statistics.\n";
static char uptime_help[] =
-"Usage: show uptime [seconds]\n"
+"Usage: core show uptime [seconds]\n"
" Shows Asterisk uptime information.\n"
" The seconds word returns the uptime in seconds only.\n";
@@ -866,7 +866,7 @@
char *c;
char filename[256];
- if (pos != 2)
+ if (pos != 1)
return NULL;
if (word[0] == '/')
@@ -967,35 +967,35 @@
};
static struct ast_cli_entry cli_cli[] = {
- { { "channel", "list", NULL },
+ { { "core", "show", "channels", NULL },
handle_chanlist, "Display information on channels",
chanlist_help, complete_show_channels },
- { { "channel", "show", NULL },
+ { { "core", "show" "channel", NULL },
handle_showchan, "Display information on a specific channel",
showchan_help, complete_ch_3 },
- { { "channel", "debug", NULL },
+ { { "core", "debug", "channel", NULL },
handle_debugchan, "Enable debugging on a channel",
debugchan_help, complete_ch_3 },
- { { "channel", "nodebug", NULL },
+ { { "core", "no", "debug", "channel", NULL },
handle_nodebugchan, "Disable debugging on a channel",
nodebugchan_help, complete_ch_3 },
- { { "core", "debug", NULL },
+ { { "core", "set", "debug", NULL },
handle_debug, "Set level of debug chattiness",
debug_help },
- { { "core", "nodebug", NULL },
+ { { "core", "set", "no", "debug", NULL },
handle_nodebug, "Turns off debug chattiness",
nodebug_help },
- { { "core", "verbose", NULL },
+ { { "core", "set", "verbose", NULL },
handle_verbose, "Set level of verboseness",
verbose_help },
- { { "group", "list", "channels", NULL },
+ { { "group", "show", "channels", NULL },
group_show_channels, "Display active channels with group(s)",
group_show_channels_help },
@@ -1007,27 +1007,27 @@
handle_logger_mute, "Toggle logging output to a console",
logger_mute_help },
- { { "module", "list", NULL },
+ { { "core", "show", "modules", NULL },
handle_modlist, "List modules and info",
modlist_help },
- { { "module", "list", "like", NULL },
+ { { "core", "show", "modules", "like", NULL },
handle_modlist, "List modules and info",
modlist_help, complete_mod_4 },
- { { "module", "load", NULL },
+ { { "load", NULL },
handle_load, "Load a module by name",
load_help, complete_fn },
- { { "module", "reload", NULL },
+ { { "reload", NULL },
handle_reload, "Reload configuration",
reload_help, complete_mod_3 },
- { { "module", "unload", NULL },
+ { { "unload", NULL },
handle_unload, "Unload a module by name",
unload_help, complete_mod_3_nr },
- { { "show", "uptime", NULL },
+ { { "core", "show", "uptime", NULL },
handle_showuptime, "Show uptime information",
uptime_help },
Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Thu Nov 2 17:16:09 2006
@@ -1388,11 +1388,11 @@
}
static char show_config_help[] =
- "Usage: core list config mappings\n"
+ "Usage: core show config mappings\n"
" Shows the filenames to config engines.\n";
static struct ast_cli_entry cli_config[] = {
- { { "core", "list", "config", "mappings", NULL },
+ { { "core", "show", "config", "mappings", NULL },
config_command, "Display config mappings (file names to config engines)",
show_config_help },
};
Modified: trunk/main/file.c
URL: http://svn.digium.com/view/asterisk/trunk/main/file.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/file.c (original)
+++ trunk/main/file.c Thu Nov 2 17:16:09 2006
@@ -1157,11 +1157,11 @@
}
char show_file_formats_usage[] =
-"Usage: core list file formats\n"
+"Usage: core show file formats\n"
" Displays currently registered file formats (if any)\n";
struct ast_cli_entry cli_file[] = {
- { { "file", "list", "formats" },
+ { { "core", "show", "file", "formats" },
show_file_formats, "Displays file formats",
show_file_formats_usage },
};
Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Thu Nov 2 17:16:09 2006
@@ -641,7 +641,7 @@
}
static char frame_show_codecs_usage[] =
-"Usage: core list codecs [audio|video|image]\n"
+"Usage: core show codecs [audio|video|image]\n"
" Displays codec mapping\n";
static int show_codec_n(int fd, int argc, char *argv[])
@@ -876,19 +876,19 @@
/* Builtin Asterisk CLI-commands for debugging */
static struct ast_cli_entry my_clis[] = {
- { { "core", "list", "codecs", NULL },
+ { { "core", "show", "codecs", NULL },
show_codecs, "Displays a list of codecs",
frame_show_codecs_usage },
- { { "core", "list", "codecs", "audio", NULL },
+ { { "core", "show", "audio", "codecs", NULL },
show_codecs, "Displays a list of audio codecs",
frame_show_codecs_usage },
- { { "core", "list", "codecs", "video", NULL },
+ { { "core", "show", "video", "codecs", NULL },
show_codecs, "Displays a list of video codecs",
frame_show_codecs_usage },
- { { "core", "list", "codecs", "image", NULL },
+ { { "core", "show", "image", "codecs", NULL },
show_codecs, "Displays a list of image codecs",
frame_show_codecs_usage },
Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Thu Nov 2 17:16:09 2006
@@ -895,11 +895,11 @@
}
static char show_http_help[] =
-"Usage: http list status\n"
+"Usage: http show status\n"
" Lists status of internal HTTP engine\n";
static struct ast_cli_entry cli_http[] = {
- { { "http", "list", "status", NULL },
+ { { "http", "show", "status", NULL },
handle_show_http, "Display HTTP server status",
show_http_help },
};
Modified: trunk/main/image.c
URL: http://svn.digium.com/view/asterisk/trunk/main/image.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/image.c (original)
+++ trunk/main/image.c Thu Nov 2 17:16:09 2006
@@ -194,9 +194,9 @@
}
struct ast_cli_entry cli_image[] = {
- { { "file", "list", "formats", "image" },
+ { { "core", "show", "image", "formats" },
show_image_formats, "Displays image formats",
- "Usage: file list formats image\n"
+ "Usage: core show image formats\n"
" displays currently registered image formats (if any)\n" },
};
Modified: trunk/main/logger.c
URL: http://svn.digium.com/view/asterisk/trunk/main/logger.c?rev=47052&r1=47051&r2=47052&view=diff
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Thu Nov 2 17:16:09 2006
@@ -570,11 +570,11 @@
" Rotates and Reopens the log files.\n";
static char logger_show_channels_help[] =
-"Usage: logger list channels\n"
+"Usage: logger show channels\n"
" List configured logger channels.\n";
static struct ast_cli_entry cli_logger[] = {
[... 274 lines stripped ...]
More information about the svn-commits
mailing list