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

7 files changed, 88 insertions, 76 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index db545c4b5..53bc37201 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 f83225109..5b08a1875 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 0c9177c92..95c333766 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 <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 @@ 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 998a74ae0..863820586 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 e1eb21e5e..02a7600df 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 <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 @@ 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 32c05e76f..06489329e 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 <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 @@ 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 <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 @@ 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 fdd8389ef..55fcb5c7a 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 },