From 79f75ec09a7fbe693481d15bd9a6ed63d0b45669 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher <tilghman@meg.abyt.es> Date: Thu, 2 Nov 2006 23:55:59 +0000 Subject: [PATCH] Merged revisions 47053 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47053 | tilghman | 2006-11-02 17:49:13 -0600 (Thu, 02 Nov 2006) | 2 lines More changes making the CLI more consistent with "category verb arguments" (continuation of issue 8236) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47054 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_h323.c | 6 +++--- channels/chan_skinny.c | 2 +- main/rtp.c | 26 +++++++++++++------------- main/udptl.c | 8 ++++---- res/res_agi.c | 2 +- res/res_jabber.c | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/channels/chan_h323.c b/channels/chan_h323.c index d8d2ce3f28..3bb49d39b3 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -2757,7 +2757,7 @@ static struct ast_cli_entry cli_h323[] = { h323_do_trace, "Enable H.323 Stack Tracing", trace_usage, NULL, &cli_h323_trace_deprecated }, - { { "h323", "no", "trace", NULL }, + { { "h323", "trace", "off", NULL }, h323_no_trace, "Disable H.323 Stack Tracing", no_trace_usage, NULL, &cli_h323_no_trace_deprecated }, @@ -2765,11 +2765,11 @@ static struct ast_cli_entry cli_h323[] = { h323_do_debug, "Enable H.323 debug", debug_usage, NULL, &cli_h323_debug_deprecated }, - { { "h323", "no", "debug", NULL }, + { { "h323", "debug", "off", NULL }, h323_no_debug, "Disable H.323 debug", no_debug_usage, NULL, &cli_h323_no_debug_deprecated }, - { { "h323", "gk", "cycle", NULL }, + { { "h323", "cycle", "gk", NULL }, h323_gk_cycle, "Manually re-register with the Gatekeper", show_cycle_usage, NULL, &cli_h323_gk_cycle_deprecated }, diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 55fcb5c7ab..ac698c96c8 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -1981,7 +1981,7 @@ static struct ast_cli_entry cli_skinny[] = { skinny_do_debug, "Enable Skinny debugging", debug_usage }, - { { "skinny", "no", "debug", NULL }, + { { "skinny", "debug", "off", NULL }, skinny_no_debug, "Disable Skinny debugging", no_debug_usage }, diff --git a/main/rtp.c b/main/rtp.c index 4570c2fcc9..a51165c688 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -3293,7 +3293,7 @@ static int rtcp_do_stats(int fd, int argc, char *argv[]) { static int rtp_no_debug(int fd, int argc, char *argv[]) { - if (argc != 2) + if (argc != 3) return RESULT_SHOWUSAGE; rtpdebug = 0; ast_cli(fd,"RTP Debugging Disabled\n"); @@ -3302,7 +3302,7 @@ static int rtp_no_debug(int fd, int argc, char *argv[]) static int rtcp_no_debug(int fd, int argc, char *argv[]) { - if (argc != 2) + if (argc != 3) return RESULT_SHOWUSAGE; rtcpdebug = 0; ast_cli(fd,"RTCP Debugging Disabled\n"); @@ -3311,7 +3311,7 @@ static int rtcp_no_debug(int fd, int argc, char *argv[]) static int rtcp_no_stats(int fd, int argc, char *argv[]) { - if (argc != 2) + if (argc != 3) return RESULT_SHOWUSAGE; rtcpstats = 0; ast_cli(fd,"RTCP Stats Disabled\n"); @@ -3330,10 +3330,10 @@ static int stun_do_debug(int fd, int argc, char *argv[]) static int stun_no_debug(int fd, int argc, char *argv[]) { - if (argc != 2) + if (argc != 3) return RESULT_SHOWUSAGE; stundebug = 0; - ast_cli(fd,"STUN Debugging Disabled\n"); + ast_cli(fd, "STUN Debugging Disabled\n"); return RESULT_SUCCESS; } @@ -3342,7 +3342,7 @@ static char debug_usage[] = " Enable dumping of all RTP packets to and from host.\n"; static char no_debug_usage[] = - "Usage: rtp nodebug\n" + "Usage: rtp debug off\n" " Disable all RTP debugging\n"; static char stun_debug_usage[] = @@ -3350,7 +3350,7 @@ static char stun_debug_usage[] = " Enable STUN (Simple Traversal of UDP through NATs) debugging\n"; static char stun_no_debug_usage[] = - "Usage: stun nodebug\n" + "Usage: stun debug off\n" " Disable STUN debugging\n"; static char rtcp_debug_usage[] = @@ -3358,7 +3358,7 @@ static char rtcp_debug_usage[] = " Enable dumping of all RTCP packets to and from host.\n"; static char rtcp_no_debug_usage[] = - "Usage: rtcp nodebug\n" + "Usage: rtcp debug off\n" " Disable all RTCP debugging\n"; static char rtcp_stats_usage[] = @@ -3366,7 +3366,7 @@ static char rtcp_stats_usage[] = " Enable dumping of RTCP stats.\n"; static char rtcp_no_stats_usage[] = - "Usage: rtcp nostats\n" + "Usage: rtcp stats off\n" " Disable all RTCP stats\n"; static struct ast_cli_entry cli_rtp[] = { @@ -3378,7 +3378,7 @@ static struct ast_cli_entry cli_rtp[] = { rtp_do_debug, "Enable RTP debugging", debug_usage }, - { { "rtp", "nodebug", NULL }, + { { "rtp", "debug", "off", NULL }, rtp_no_debug, "Disable RTP debugging", no_debug_usage }, @@ -3390,7 +3390,7 @@ static struct ast_cli_entry cli_rtp[] = { rtcp_do_debug, "Enable RTCP debugging", rtcp_debug_usage }, - { { "rtcp", "nodebug", NULL }, + { { "rtcp", "debug", "off", NULL }, rtcp_no_debug, "Disable RTCP debugging", rtcp_no_debug_usage }, @@ -3398,7 +3398,7 @@ static struct ast_cli_entry cli_rtp[] = { rtcp_do_stats, "Enable RTCP stats", rtcp_stats_usage }, - { { "rtcp", "nostats", NULL }, + { { "rtcp", "stats", "off", NULL }, rtcp_no_stats, "Disable RTCP stats", rtcp_no_stats_usage }, @@ -3406,7 +3406,7 @@ static struct ast_cli_entry cli_rtp[] = { stun_do_debug, "Enable STUN debugging", stun_debug_usage }, - { { "stun", "nodebug", NULL }, + { { "stun", "debug", "off", NULL }, stun_no_debug, "Disable STUN debugging", stun_no_debug_usage }, }; diff --git a/main/udptl.c b/main/udptl.c index 1e0e518cc9..91a626c8f9 100644 --- a/main/udptl.c +++ b/main/udptl.c @@ -1146,7 +1146,7 @@ static int udptl_do_debug(int fd, int argc, char *argv[]) static int udptl_nodebug(int fd, int argc, char *argv[]) { - if (argc != 2) + if (argc != 3) return RESULT_SHOWUSAGE; udptldebug = 0; ast_cli(fd,"UDPTL Debugging Disabled\n"); @@ -1158,7 +1158,7 @@ static char debug_usage[] = " Enable dumping of all UDPTL packets to and from host.\n"; static char nodebug_usage[] = - "Usage: udptl nodebug\n" + "Usage: udptl debug off\n" " Disable all UDPTL debugging\n"; static struct ast_cli_entry cli_udptl[] = { @@ -1170,9 +1170,9 @@ static struct ast_cli_entry cli_udptl[] = { udptl_do_debug, "Enable UDPTL debugging on IP", debug_usage }, - { { "udptl", "nodebug", NULL }, + { { "udptl", "debug", "off", NULL }, udptl_nodebug, "Disable UDPTL debugging", - nodebug_usage, NULL, NULL }, + nodebug_usage }, }; void ast_udptl_reload(void) diff --git a/res/res_agi.c b/res/res_agi.c index 57a034b336..cd4cd54ed5 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -2100,7 +2100,7 @@ static struct ast_cli_entry cli_agi[] = { agi_do_debug, "Enable AGI debugging", debug_usage }, - { { "agi", "nodebug", NULL }, + { { "agi", "debug", "off", NULL }, agi_no_debug, "Disable AGI debugging", no_debug_usage }, diff --git a/res/res_jabber.c b/res/res_jabber.c index 0a7f5fb924..16cc667460 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -103,7 +103,7 @@ static char debug_usage[] = " Enables dumping of Jabber packets for debugging purposes.\n"; static char no_debug_usage[] = -"Usage: jabber no debug\n" +"Usage: jabber debug off\n" " Disables dumping of Jabber packets for debugging purposes.\n"; static char reload_usage[] = @@ -128,7 +128,7 @@ static struct ast_cli_entry aji_cli[] = { aji_show_clients, "Show state of clients and components", debug_usage }, - { { "jabber", "no", "debug", NULL}, + { { "jabber", "debug", "off", NULL}, aji_no_debug, "Disable Jabber debug", no_debug_usage }, -- GitLab