From: Tilghman Lesher Date: Thu, 2 Nov 2006 23:16:09 +0000 (+0000) Subject: Merged revisions 47051 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~4154 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10875731ecfbe329b31be706d30a81dd579c3b56;p=thirdparty%2Fasterisk.git 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" ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47052 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_queue.c b/apps/app_queue.c index fa366fb5fc..ff1623ca0c 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -4010,12 +4010,12 @@ static int reload_queues(void) 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 @@ static int __queues_show(struct mansession *s, int manager, int fd, int argc, ch 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 @@ static int __queues_show(struct mansession *s, int manager, int fd, int argc, ch 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 char *complete_queue(const char *line, const char *word, int pos, int sta */ static int manager_queues_show( struct mansession *s, struct message *m ) { - char *a[] = { "queue", "list" }; + char *a[] = { "queue", "show" }; - __queues_show(s, 1, -1, 2, a, 0); + __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 @@ static char *complete_queue_remove_member(const char *line, const char *word, in 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 @@ static char qrm_cmd_usage[] = "Usage: queue remove member from \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 }, diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 3521ab991c..a9c7537ebf 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -6738,11 +6738,11 @@ static int vmauthenticate(struct ast_channel *chan, void *data) } static char voicemail_show_users_help[] = -"Usage: voicemail list users [for ]\n" +"Usage: voicemail show users [for ]\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 char *complete_voicemail_show_users(const char *line, const char *word, i } 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 }, }; diff --git a/channels/chan_agent.c b/channels/chan_agent.c index db545c4b5e..53bc372011 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -1720,11 +1720,11 @@ static int agents_show_online(int fd, int argc, char **argv) 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 @@ static char agent_logoff_usage[] = " 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 }, diff --git a/channels/chan_features.c b/channels/chan_features.c index f832251097..5b08a18758 100644 --- a/channels/chan_features.c +++ b/channels/chan_features.c @@ -531,11 +531,11 @@ static int features_show(int fd, int argc, char **argv) } 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 }, }; diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 0c9177c92a..95c3337662 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4478,7 +4478,7 @@ static int iax2_do_jb_debug(int fd, int argc, char *argv[]) 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_debug(int fd, int argc, char *argv[]) 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_trunk_debug(int fd, int argc, char *argv[]) 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 struct ast_switch iax2_switch = }; 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 @@ static char set_mtu_usage[] = " 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 @@ static char show_prov_usage[] = " fields will be provisioned as empty fields.\n"; static char show_users_usage[] = -"Usage: iax2 list users [like ]\n" +"Usage: iax2 show users [like ]\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 ]\n" +"Usage: iax2 show peers [registered] [like ]\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 @@ static char iax2_test_jitter_usage[] = #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 @@ static struct ast_cli_entry cli_iax2[] = { 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 @@ static struct ast_cli_entry cli_iax2[] = { 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 }, diff --git a/channels/chan_local.c b/channels/chan_local.c index 998a74ae09..863820586e 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -626,11 +626,11 @@ static int locals_show(int fd, int argc, char **argv) } 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 }, }; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index e1eb21e5ef..02a7600df4 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1045,11 +1045,11 @@ static int mgcp_show_endpoints(int fd, int argc, char *argv[]) } 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 \n" +"Usage: mgcp audit endpoint \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 @@ static char debug_usage[] = " 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_do_debug(int fd, int argc, char *argv[]) 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 int mgcp_no_debug(int fd, int argc, char *argv[]) } 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 @@ static struct ast_cli_entry cli_mgcp[] = { 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_do_reload(void) 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"); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 32c05e76f2..06489329eb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -10929,7 +10929,7 @@ static int sip_notify(int fd, int argc, char *argv[]) /*! \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 @@ static int sip_do_history(int fd, int argc, char *argv[]) /*! \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 int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d } 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 @@ static char notify_usage[] = " Message types are defined in sip_notify.conf\n"; static char show_users_usage[] = -"Usage: sip list users [like ]\n" +"Usage: sip show users [like ]\n" " Lists all known SIP users.\n" " Optional regular expression pattern is used to filter the user list.\n"; @@ -11171,12 +11171,12 @@ static char show_user_usage[] = " 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 @@ static char show_history_usage[] = " Provides detailed dialog history on a given SIP channel.\n"; static char show_peers_usage[] = -"Usage: sip list peers [like ]\n" +"Usage: sip show peers [like ]\n" " Lists all known SIP peers.\n" " Optional regular expression pattern is used to filter the peer list.\n"; @@ -11203,7 +11203,7 @@ static char prune_realtime_usage[] = " 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 @@ static char debug_usage[] = " 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 history_usage[] = 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 @@ static int sip_do_reload(enum channelreloadreason reason) /*! \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 @@ static int reload(void) /*! \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 @@ static struct ast_cli_entry cli_sip[] = { 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 @@ static struct ast_cli_entry cli_sip[] = { sip_do_history, "Enable SIP history", history_usage }, - { { "sip", "nohistory", NULL }, + { { "sip", "history", "off", NULL }, sip_no_history, "Disable SIP history", no_history_usage }, diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index fdd8389efb..55fcb5c7ab 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1750,7 +1750,7 @@ static struct ast_rtp_protocol skinny_rtp = { 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_do_debug(int fd, int argc, char *argv[]) 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 int skinny_show_lines(int fd, int argc, char *argv[]) } 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 @@ static char debug_usage[] = " 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 @@ static char reset_usage[] = " 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 @@ static struct ast_cli_entry cli_skinny[] = { skinny_do_debug, "Enable Skinny debugging", debug_usage }, - { { "skinny", "nodebug", NULL }, + { { "skinny", "no", "debug", NULL }, skinny_no_debug, "Disable Skinny debugging", no_debug_usage }, diff --git a/main/asterisk.c b/main/asterisk.c index b475e0385a..5b46006cca 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -138,10 +138,10 @@ int daemon(int, int); /* defined in libresolv of all places */ #define WELCOME_MESSAGE \ ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \ ast_verbose("Created by Mark Spencer \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 @@ struct thread_list_t { 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 int handle_show_profile(int fd, int argc, char *argv[]) } static char show_version_files_help[] = -"Usage: file list version [like ]\n" +"Usage: core show file version [like ]\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 @@ static char bang_help[] = " 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 @@ static struct ast_cli_entry cli_asterisk[] = { 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 @@ static struct ast_cli_entry cli_asterisk[] = { 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 */ diff --git a/main/channel.c b/main/channel.c index 65572d3e84..17d368372f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -289,19 +289,19 @@ static char *complete_channeltypes(const char *line, const char *word, int pos, } 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 \n" +"Usage: core show channeltype \n" " Show details about the specified channel type, .\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 }, }; diff --git a/main/cli.c b/main/cli.c index 09d37a0495..ec576cfe86 100644 --- a/main/cli.c +++ b/main/cli.c @@ -76,11 +76,11 @@ void ast_cli(int fd, char *fmt, ...) static AST_LIST_HEAD_STATIC(helpers, ast_cli_entry); static char load_help[] = -"Usage: module load \n" +"Usage: load \n" " Loads the specified module into Asterisk.\n"; static char unload_help[] = -"Usage: module unload [-f|-h] \n" +"Usage: unload [-f|-h] \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 @@ static char help_help[] = " 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 \n" +"Usage: core set verbose \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 [filename]\n" +"Usage: core set debug [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 @@ static char softhangup_help[] = " 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) + if (argc != 2) return RESULT_SHOWUSAGE; - if (ast_load_resource(argv[2])) { - ast_cli(fd, "Unable to load module %s\n", argv[2]); + 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 @@ static int handle_reload(int fd, int argc, char *argv[]) { int x; int res; - if (argc < 2) + if (argc < 1) return RESULT_SHOWUSAGE; - if (argc > 2) { - for (x=2;x 1) { + for (x=1;x]\n" +"Usage: core show applications [{like|describing} ]\n" " List applications which are currently available.\n" " If 'like', will be a substring of the app name\n" " If 'describing', will be a substring of the description\n"; static char show_functions_help[] = -"Usage: core list functions [like ]\n" +"Usage: core show functions [like ]\n" " List builtin functions, optionally only those matching a given string\n"; static char show_switches_help[] = -"Usage: core list switches\n" +"Usage: core show switches\n" " List registered switches\n"; static char show_hints_help[] = -"Usage: core list hints\n" +"Usage: core show hints\n" " List registered hints\n"; static char show_globals_help[] = -"Usage: core list globals\n" +"Usage: core show globals\n" " List current global dialplan variables and their values\n"; static char show_application_help[] = @@ -2917,7 +2917,7 @@ static char show_function_help[] = " Describe a particular dialplan function.\n"; static char show_dialplan_help[] = -"Usage: dialplan show [exten@][context]\n" +"Usage: core show dialplan [exten@][context]\n" " Show dialplan\n"; static char set_global_help[] = @@ -3687,23 +3687,23 @@ static int handle_set_global(int fd, int argc, char *argv[]) * CLI entries for upper commands ... */ static struct ast_cli_entry pbx_cli[] = { - { { "core", "list", "applications", NULL }, + { { "core", "show", "applications", NULL }, handle_show_applications, "Shows registered dialplan applications", show_applications_help, complete_show_applications }, - { { "core", "list", "functions", NULL }, + { { "core", "show", "functions", NULL }, handle_show_functions, "Shows registered dialplan functions", show_functions_help }, - { { "core", "list", "switches", NULL }, + { { "core", "show", "switches", NULL }, handle_show_switches, "Show alternative switches", show_switches_help }, - { { "core", "list", "hints", NULL }, + { { "core", "show", "hints", NULL }, handle_show_hints, "Show dialplan hints", show_hints_help }, - { { "core", "list", "globals", NULL }, + { { "core", "show", "globals", NULL }, handle_show_globals, "Show global dialplan variables", show_globals_help }, diff --git a/res/res_agi.c b/res/res_agi.c index 971db0b2f3..57a034b336 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -95,7 +95,7 @@ static char *descrip = "variable to \"no\" before executing the AGI application.\n" " Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n" "on file descriptor 3\n\n" -" Use the CLI command 'agi list' to list available agi commands\n" +" Use the CLI command 'agi show' to list available agi commands\n" " This application sets the following channel variable upon completion:\n" " AGISTATUS The status of the attempt to the run the AGI script\n" " text string, one of SUCCESS | FAILED | HANGUP\n"; @@ -2085,7 +2085,7 @@ static int deadagi_exec(struct ast_channel *chan, void *data) } static char showagi_help[] = -"Usage: agi list [topic]\n" +"Usage: agi show [topic]\n" " When called with a topic as an argument, displays usage\n" " information on the given command. If called without a\n" " topic, it provides a list of AGI commands.\n"; @@ -2104,7 +2104,7 @@ static struct ast_cli_entry cli_agi[] = { agi_no_debug, "Disable AGI debugging", no_debug_usage }, - { { "agi", "list", NULL }, + { { "agi", "show", NULL }, handle_showagi, "List AGI commands or specific help", showagi_help }, diff --git a/res/res_crypto.c b/res/res_crypto.c index 0557167897..b5035b1c58 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -556,7 +556,7 @@ static int init_keys(int fd, int argc, char *argv[]) } static char show_key_usage[] = -"Usage: keys list\n" +"Usage: keys show\n" " Displays information about RSA keys known by Asterisk\n"; static char init_keys_usage[] = @@ -564,7 +564,7 @@ static char init_keys_usage[] = " Initializes private keys (by reading in pass code from the user)\n"; static struct ast_cli_entry cli_crypto[] = { - { { "keys", "list", NULL }, + { { "keys", "show", NULL }, show_keys, "Displays RSA key information", show_key_usage }, diff --git a/res/res_features.c b/res/res_features.c index e48c2e00f8..f8a1168e12 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1932,7 +1932,7 @@ static char showparked_help[] = " Lists currently parked calls.\n"; static struct ast_cli_entry cli_features[] = { - { { "feature", "list", NULL }, + { { "feature", "show", NULL }, handle_showfeatures, "Lists configured features", showfeatures_help }, diff --git a/res/res_indications.c b/res/res_indications.c index 25a0d4d7c8..a4d8ae20e2 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -64,7 +64,7 @@ static char help_remove_indication[] = " Remove the given indication from the country.\n"; static char help_show_indications[] = -"Usage: indication list [ ...]\n" +"Usage: indication show [ ...]\n" " Display either a condensed for of all country/indications, or the\n" " indications for the specified countries.\n"; @@ -354,7 +354,7 @@ static struct ast_cli_entry cli_indications[] = { handle_remove_indication, "Remove the given indication from the country", help_remove_indication, NULL }, - { { "indication", "list", NULL }, + { { "indication", "show", NULL }, handle_show_indications, "Display a list of all countries/indications", help_show_indications }, }; diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 0902602b79..72afed5d73 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1142,11 +1142,11 @@ static struct ast_cli_entry cli_moh[] = { moh_cli, "Music On Hold", "Music On Hold" }, - { { "moh", "list", "classes"}, + { { "moh", "show", "classes"}, moh_classes_show, "List MOH classes", "Lists all MOH classes" }, - { { "moh", "list", "files"}, + { { "moh", "show", "files"}, cli_files_show, "List MOH file-based classes", "Lists all loaded file-based MOH classes and their files" }, }; diff --git a/res/res_odbc.c b/res/res_odbc.c index e8f81ba4dc..036b021517 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -338,12 +338,12 @@ static int odbc_show_command(int fd, int argc, char **argv) } static char show_usage[] = -"Usage: odbc list []\n" +"Usage: odbc show []\n" " List settings of a particular ODBC class.\n" " or, if not specified, all classes.\n"; static struct ast_cli_entry cli_odbc[] = { - { { "odbc", "list", NULL }, + { { "odbc", "show", NULL }, odbc_show_command, "List ODBC DSN(s)", show_usage }, };