[svn-commits] tilghman: branch 1.4 r47053 - in /branches/1.4: apps/
channels/ main/ res/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Nov 2 16:49:13 MST 2006
Author: tilghman
Date: Thu Nov 2 17:49:13 2006
New Revision: 47053
URL: http://svn.digium.com/view/asterisk?rev=47053&view=rev
Log:
More changes making the CLI more consistent with "category verb arguments" (continuation of issue 8236)
Modified:
branches/1.4/apps/app_queue.c
branches/1.4/channels/chan_h323.c
branches/1.4/channels/chan_skinny.c
branches/1.4/main/rtp.c
branches/1.4/main/udptl.c
branches/1.4/res/res_agi.c
branches/1.4/res/res_jabber.c
Modified: branches/1.4/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_queue.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/apps/app_queue.c (original)
+++ branches/1.4/apps/app_queue.c Thu Nov 2 17:49:13 2006
@@ -4390,11 +4390,6 @@
static char qrm_cmd_usage[] =
"Usage: queue remove member <channel> from <queue>\n";
-static struct ast_cli_entry cli_show_queues_deprecated = {
- { "show", "queues", NULL },
- queue_show, NULL,
- NULL, NULL };
-
static struct ast_cli_entry cli_show_queue_deprecated = {
{ "show", "queue", NULL },
queue_show, NULL,
@@ -4411,6 +4406,11 @@
NULL, complete_queue_remove_member };
static struct ast_cli_entry cli_queue[] = {
+ /* Deprecated */
+ { { "show", "queues", NULL },
+ queue_show, NULL,
+ NULL, NULL },
+
{ { "queue", "show", NULL },
queue_show, "Show status of a specified queue",
queue_show_usage, complete_queue, &cli_show_queue_deprecated },
Modified: branches/1.4/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_h323.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/channels/chan_h323.c (original)
+++ branches/1.4/channels/chan_h323.c Thu Nov 2 17:49:13 2006
@@ -2612,7 +2612,7 @@
" Enables H.323 stack tracing for debugging purposes\n";
static char no_trace_usage[] =
-"Usage: h.323 no trace\n"
+"Usage: h.323 trace off\n"
" Disables H.323 stack tracing for debugging purposes\n";
static char debug_usage[] =
@@ -2620,7 +2620,7 @@
" Enables H.323 debug output\n";
static char no_debug_usage[] =
-"Usage: h.323 no debug\n"
+"Usage: h.323 debug off\n"
" Disables H.323 debug output\n";
static char show_cycle_usage[] =
@@ -2638,23 +2638,33 @@
static char h323_reload_usage[] =
"Usage: h323 reload\n"
" Reloads H.323 configuration from h323.conf\n";
+
+static struct ast_cli_entry cli_h323_no_trace_deprecated = {
+ { { "h.323", "no", "trace", NULL },
+ h323_no_trace, "Disable H.323 Stack Tracing",
+ no_trace_usage };
+
+static struct ast_cli_entry cli_h323_no_debug_deprecated = {
+ { { "h.323", "no", "debug", NULL },
+ h323_no_debug, "Disable H.323 debug",
+ no_debug_usage };
static struct ast_cli_entry cli_h323[] = {
{ { "h.323", "trace", NULL },
h323_do_trace, "Enable H.323 Stack Tracing",
trace_usage },
- { { "h.323", "no", "trace", NULL },
+ { { "h.323", "trace", "off", NULL },
h323_no_trace, "Disable H.323 Stack Tracing",
- no_trace_usage },
+ no_trace_usage, NULL, cli_h323_no_trace_deprecated },
{ { "h.323", "debug", NULL },
h323_do_debug, "Enable H.323 debug",
debug_usage },
- { { "h.323", "no", "debug", NULL },
+ { { "h.323", "debug", "off", NULL },
h323_no_debug, "Disable H.323 debug",
- no_debug_usage },
+ no_debug_usage, NULL, cli_h323_no_debug_deprecated },
{ { "h.323", "gk", "cycle", NULL },
h323_gk_cycle, "Manually re-register with the Gatekeper",
Modified: branches/1.4/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_skinny.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/channels/chan_skinny.c (original)
+++ branches/1.4/channels/chan_skinny.c Thu Nov 2 17:49:13 2006
@@ -1981,7 +1981,7 @@
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 },
Modified: branches/1.4/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/rtp.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/main/rtp.c (original)
+++ branches/1.4/main/rtp.c Thu Nov 2 17:49:13 2006
@@ -3269,7 +3269,7 @@
return RESULT_SUCCESS;
}
-static int rtp_no_debug_deprecated(int fd, int argc, char *argv[])
+static int rtp_no_debug(int fd, int argc, char *argv[])
{
if (argc != 3)
return RESULT_SHOWUSAGE;
@@ -3278,15 +3278,6 @@
return RESULT_SUCCESS;
}
-static int rtp_no_debug(int fd, int argc, char *argv[])
-{
- if (argc != 2)
- return RESULT_SHOWUSAGE;
- rtpdebug = 0;
- ast_cli(fd,"RTP Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
static int rtcp_no_debug_deprecated(int fd, int argc, char *argv[])
{
if (argc != 4)
@@ -3298,7 +3289,7 @@
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");
@@ -3316,7 +3307,7 @@
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");
@@ -3333,21 +3324,12 @@
return RESULT_SUCCESS;
}
-static int stun_no_debug_deprecated(int fd, int argc, char *argv[])
+static int stun_no_debug(int fd, int argc, char *argv[])
{
if (argc != 3)
return RESULT_SHOWUSAGE;
stundebug = 0;
- ast_cli(fd,"STUN Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
-static int stun_no_debug(int fd, int argc, char *argv[])
-{
- if (argc != 2)
- return RESULT_SHOWUSAGE;
- stundebug = 0;
- ast_cli(fd,"STUN Debugging Disabled\n");
+ ast_cli(fd, "STUN Debugging Disabled\n");
return RESULT_SUCCESS;
}
@@ -3356,7 +3338,7 @@
" 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[] =
@@ -3364,7 +3346,7 @@
" 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[] =
@@ -3372,7 +3354,7 @@
" 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[] =
@@ -3380,12 +3362,12 @@
" 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_no_debug_deprecated = {
{ "rtp", "no", "debug", NULL },
- rtp_no_debug_deprecated, NULL,
+ rtp_no_debug, NULL,
NULL };
static struct ast_cli_entry cli_rtp_rtcp_debug_ip_deprecated = {
@@ -3415,7 +3397,7 @@
static struct ast_cli_entry cli_stun_no_debug_deprecated = {
{ "stun", "no", "debug", NULL },
- stun_no_debug_deprecated, NULL,
+ stun_no_debug, NULL,
NULL };
static struct ast_cli_entry cli_rtp[] = {
@@ -3427,7 +3409,7 @@
rtp_do_debug, "Enable RTP debugging",
debug_usage },
- { { "rtp", "nodebug", NULL },
+ { { "rtp", "debug", "off", NULL },
rtp_no_debug, "Disable RTP debugging",
no_debug_usage, NULL, &cli_rtp_no_debug_deprecated },
@@ -3439,7 +3421,7 @@
rtcp_do_debug, "Enable RTCP debugging",
rtcp_debug_usage, NULL, &cli_rtp_rtcp_debug_deprecated },
- { { "rtcp", "nodebug", NULL },
+ { { "rtcp", "debug", "off", NULL },
rtcp_no_debug, "Disable RTCP debugging",
rtcp_no_debug_usage, NULL, &cli_rtp_rtcp_no_debug_deprecated },
@@ -3447,7 +3429,7 @@
rtcp_do_stats, "Enable RTCP stats",
rtcp_stats_usage, NULL, &cli_rtp_rtcp_stats_deprecated },
- { { "rtcp", "nostats", NULL },
+ { { "rtcp", "stats", "off", NULL },
rtcp_no_stats, "Disable RTCP stats",
rtcp_no_stats_usage, NULL, &cli_rtp_rtcp_no_stats_deprecated },
@@ -3455,7 +3437,7 @@
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, NULL, &cli_stun_no_debug_deprecated },
};
Modified: branches/1.4/main/udptl.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/udptl.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/main/udptl.c (original)
+++ branches/1.4/main/udptl.c Thu Nov 2 17:49:13 2006
@@ -1135,35 +1135,26 @@
return RESULT_SUCCESS;
}
-static int udptl_nodebug_deprecated(int fd, int argc, char *argv[])
-{
- if (argc !=3)
+static int udptl_nodebug(int fd, int argc, char *argv[])
+{
+ if (argc != 3)
return RESULT_SHOWUSAGE;
udptldebug = 0;
ast_cli(fd,"UDPTL Debugging Disabled\n");
return RESULT_SUCCESS;
}
-static int udptl_nodebug(int fd, int argc, char *argv[])
-{
- if (argc != 2)
- return RESULT_SHOWUSAGE;
- udptldebug = 0;
- ast_cli(fd,"UDPTL Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
static char debug_usage[] =
"Usage: udptl debug [ip host[:port]]\n"
" 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_no_debug = {
{ "udptl", "no", "debug", NULL },
- udptl_nodebug_deprecated, NULL,
+ udptl_nodebug, NULL,
NULL };
static struct ast_cli_entry cli_udptl[] = {
@@ -1175,7 +1166,7 @@
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, &cli_udptl_no_debug },
};
Modified: branches/1.4/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_agi.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/res/res_agi.c (original)
+++ branches/1.4/res/res_agi.c Thu Nov 2 17:49:13 2006
@@ -2114,7 +2114,7 @@
agi_do_debug, "Enable AGI debugging",
debug_usage },
- { { "agi", "nodebug", NULL },
+ { { "agi", "debug", "off", NULL },
agi_no_debug, "Disable AGI debugging",
no_debug_usage, NULL, &cli_agi_no_debug_deprecated },
Modified: branches/1.4/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_jabber.c?rev=47053&r1=47052&r2=47053&view=diff
==============================================================================
--- branches/1.4/res/res_jabber.c (original)
+++ branches/1.4/res/res_jabber.c Thu Nov 2 17:49:13 2006
@@ -103,7 +103,7 @@
" 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 @@
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 },
More information about the svn-commits
mailing list