[asterisk-commits] mvanbaak: branch group/res_clialiases r145166 - in /team/group/res_clialiases...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Sep 28 22:54:48 CDT 2008
Author: mvanbaak
Date: Sun Sep 28 22:54:48 2008
New Revision: 145166
URL: http://svn.digium.com/view/asterisk?view=rev&rev=145166
Log:
Deprecated commands, BE GONE !
Removed:
team/group/res_clialiases/TODO_remove_these.txt
Modified:
team/group/res_clialiases/channels/chan_mgcp.c
team/group/res_clialiases/channels/chan_sip.c
team/group/res_clialiases/channels/chan_skinny.c
team/group/res_clialiases/funcs/func_devstate.c
team/group/res_clialiases/main/asterisk.c
team/group/res_clialiases/main/cdr.c
team/group/res_clialiases/main/cli.c
team/group/res_clialiases/main/pbx.c
team/group/res_clialiases/main/rtp.c
team/group/res_clialiases/main/udptl.c
team/group/res_clialiases/pbx/pbx_ael.c
team/group/res_clialiases/pbx/pbx_dundi.c
team/group/res_clialiases/res/res_agi.c
team/group/res_clialiases/res/res_jabber.c
Modified: team/group/res_clialiases/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/channels/chan_mgcp.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/channels/chan_mgcp.c (original)
+++ team/group/res_clialiases/channels/chan_mgcp.c Sun Sep 28 22:54:48 2008
@@ -1139,31 +1139,6 @@
return CLI_SUCCESS;
}
-static char *handle_mgcp_set_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "mgcp set debug [off]";
- e->usage =
- "Usage: mgcp set debug [off]\n"
- " Enables/Disables dumping of MGCP packets for debugging purposes\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 3 || a->argc > 4)
- return CLI_SHOWUSAGE;
- if (a->argc == 3) {
- mgcpdebug = 1;
- ast_cli(a->fd, "MGCP Debugging Enabled\n");
- } else if (!strncasecmp(a->argv[3], "off", 3)) {
- mgcpdebug = 0;
- ast_cli(a->fd, "MGCP Debugging Disabled\n");
- }
- return CLI_SUCCESS;
-}
-
static char *handle_mgcp_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -1192,11 +1167,10 @@
return CLI_SUCCESS;
}
-static struct ast_cli_entry cli_mgcp_set_debug_deprecated = AST_CLI_DEFINE(handle_mgcp_set_debug_deprecated, "Enable/Disable MGCP debugging");
static struct ast_cli_entry cli_mgcp[] = {
AST_CLI_DEFINE(handle_mgcp_audit_endpoint, "Audit specified MGCP endpoint"),
AST_CLI_DEFINE(handle_mgcp_show_endpoints, "List defined MGCP endpoints"),
- AST_CLI_DEFINE(handle_mgcp_set_debug, "Enable/Disable MGCP debugging", .deprecate_cmd = &cli_mgcp_set_debug_deprecated),
+ AST_CLI_DEFINE(handle_mgcp_set_debug, "Enable/Disable MGCP debugging"),
AST_CLI_DEFINE(mgcp_reload, "Reload MGCP configuration"),
};
Modified: team/group/res_clialiases/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/channels/chan_sip.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/channels/chan_sip.c (original)
+++ team/group/res_clialiases/channels/chan_sip.c Sun Sep 28 22:54:48 2008
@@ -2038,7 +2038,6 @@
static char *sip_do_debug_peer(int fd, char *arg);
static char *sip_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
static char *sip_cli_notify(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
-static char *sip_do_history_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
static char *sip_set_history(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
static int sip_dtmfmode(struct ast_channel *chan, void *data);
static int sip_addheader(struct ast_channel *chan, void *data);
@@ -14511,36 +14510,6 @@
transmit_notify_custom(p, varlist);
}
- return CLI_SUCCESS;
-}
-
-/*! \brief Enable/Disable SIP History logging (CLI) - deprecated. use sip_set_history instead */
-static char *sip_do_history_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "sip history [off]";
- e->usage =
- "Usage: sip history [off]\n"
- " Enables/Disables recording of SIP dialog history for debugging purposes.\n"
- " Use 'sip show history' to view the history of a call number.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 2 || a->argc > 3) {
- return CLI_SHOWUSAGE;
- }
- if (a->argc == 2) {
- recordhistory = TRUE;
- ast_cli(a->fd, "SIP History Recording Enabled (use 'sip show history')\n");
- } else {
- if (strncasecmp(a->argv[2], "off", 3))
- return CLI_SHOWUSAGE;
- recordhistory = FALSE;
- ast_cli(a->fd, "SIP History Recording Disabled\n");
- }
return CLI_SUCCESS;
}
@@ -22595,7 +22564,6 @@
return 1;
}
-static struct ast_cli_entry cli_sip_do_history_deprecated = AST_CLI_DEFINE(sip_do_history_deprecated, "Enable/Disable SIP history");
/*! \brief SIP Cli commands definition */
static struct ast_cli_entry cli_sip[] = {
AST_CLI_DEFINE(sip_show_channels, "List active SIP channels or subscriptions"),
@@ -22615,7 +22583,7 @@
AST_CLI_DEFINE(sip_show_sched, "Present a report on the status of the sched queue"),
AST_CLI_DEFINE(sip_prune_realtime, "Prune cached Realtime users/peers"),
AST_CLI_DEFINE(sip_do_debug, "Enable/Disable SIP debugging"),
- AST_CLI_DEFINE(sip_set_history, "Enable/Disable SIP history", .deprecate_cmd = &cli_sip_do_history_deprecated),
+ AST_CLI_DEFINE(sip_set_history, "Enable/Disable SIP history"),
AST_CLI_DEFINE(sip_reload, "Reload SIP configuration"),
AST_CLI_DEFINE(sip_show_tcp, "List TCP Connections")
};
Modified: team/group/res_clialiases/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/channels/chan_skinny.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/channels/chan_skinny.c (original)
+++ team/group/res_clialiases/channels/chan_skinny.c Sun Sep 28 22:54:48 2008
@@ -2491,35 +2491,6 @@
.set_rtp_peer = skinny_set_rtp_peer,
};
-static char *handle_skinny_set_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "skinny set debug [off]";
- e->usage =
- "Usage: skinny set debug [off]\n"
- " Enables/Disables dumping of Skinny packets for debugging purposes\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 3 || a->argc > 4)
- return CLI_SHOWUSAGE;
-
- if (a->argc == 3) {
- skinnydebug = 1;
- ast_cli(a->fd, "Skinny Debugging Enabled\n");
- return CLI_SUCCESS;
- } else if (!strncasecmp(a->argv[3], "off", 3)) {
- skinnydebug = 0;
- ast_cli(a->fd, "Skinny Debugging Disabled\n");
- return CLI_SUCCESS;
- } else {
- return CLI_SHOWUSAGE;
- }
-}
-
static char *handle_skinny_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -3017,14 +2988,13 @@
return CLI_SUCCESS;
}
-static struct ast_cli_entry cli_skinny_set_debug_deprecated = AST_CLI_DEFINE(handle_skinny_set_debug_deprecated, "Enable/Disable Skinny debugging");
static struct ast_cli_entry cli_skinny[] = {
AST_CLI_DEFINE(handle_skinny_show_devices, "List defined Skinny devices"),
AST_CLI_DEFINE(handle_skinny_show_device, "List Skinny device information"),
AST_CLI_DEFINE(handle_skinny_show_lines, "List defined Skinny lines per device"),
AST_CLI_DEFINE(handle_skinny_show_line, "List Skinny line information"),
AST_CLI_DEFINE(handle_skinny_show_settings, "List global Skinny settings"),
- AST_CLI_DEFINE(handle_skinny_set_debug, "Enable/Disable Skinny debugging", .deprecate_cmd = &cli_skinny_set_debug_deprecated),
+ AST_CLI_DEFINE(handle_skinny_set_debug, "Enable/Disable Skinny debugging"),
AST_CLI_DEFINE(handle_skinny_reset, "Reset Skinny device(s)"),
};
Modified: team/group/res_clialiases/funcs/func_devstate.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/funcs/func_devstate.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/funcs/func_devstate.c (original)
+++ team/group/res_clialiases/funcs/func_devstate.c Sun Sep 28 22:54:48 2008
@@ -135,50 +135,6 @@
ast_db_get(astdb_family, data, buf, sizeof(buf));
return ast_devstate_val(buf);
-}
-
-static char *handle_cli_funcdevstate_list(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- struct ast_db_entry *db_entry, *db_tree;
-
- switch (cmd) {
- case CLI_INIT:
- e->command = "funcdevstate list";
- e->usage =
- "Usage: funcdevstate list\n"
- " List all custom device states that have been set by using\n"
- " the DEVICE_STATE dialplan function.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc != e->args)
- return CLI_SHOWUSAGE;
-
- ast_cli(a->fd, "\n"
- "---------------------------------------------------------------------\n"
- "--- Custom Device States --------------------------------------------\n"
- "---------------------------------------------------------------------\n"
- "---\n");
-
- db_entry = db_tree = ast_db_gettree(astdb_family, NULL);
- for (; db_entry; db_entry = db_entry->next) {
- const char *dev_name = strrchr(db_entry->key, '/') + 1;
- if (dev_name <= (const char *) 1)
- continue;
- ast_cli(a->fd, "--- Name: 'Custom:%s' State: '%s'\n"
- "---\n", dev_name, db_entry->data);
- }
- ast_db_freetree(db_tree);
- db_tree = NULL;
-
- ast_cli(a->fd,
- "---------------------------------------------------------------------\n"
- "---------------------------------------------------------------------\n"
- "\n");
-
- return CLI_SUCCESS;
}
static char *handle_cli_devstate_list(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -288,9 +244,8 @@
return CLI_SUCCESS;
}
-static struct ast_cli_entry cli_funcdevstate_list_deprecated = AST_CLI_DEFINE(handle_cli_funcdevstate_list, "List currently known custom device states");
static struct ast_cli_entry cli_funcdevstate[] = {
- AST_CLI_DEFINE(handle_cli_devstate_list, "List currently known custom device states", .deprecate_cmd = &cli_funcdevstate_list_deprecated),
+ AST_CLI_DEFINE(handle_cli_devstate_list, "List currently known custom device states"),
AST_CLI_DEFINE(handle_cli_devstate_change, "Change a custom device state"),
};
Modified: team/group/res_clialiases/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/main/asterisk.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/main/asterisk.c (original)
+++ team/group/res_clialiases/main/asterisk.c Sun Sep 28 22:54:48 2008
@@ -1589,14 +1589,6 @@
return CLI_SUCCESS;
}
-static char *handle_stop_now_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_stop_now(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "stop now";
- return res;
-}
-
static char *handle_stop_gracefully(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -1617,14 +1609,6 @@
return CLI_SUCCESS;
}
-static char *handle_stop_gracefully_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_stop_gracefully(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "stop gracefully";
- return res;
-}
-
static char *handle_stop_when_convenient(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -1643,14 +1627,6 @@
ast_cli(a->fd, "Waiting for inactivity to perform halt\n");
quit_handler(0, 2 /* really nicely */, 1 /* safely */, 0 /* don't restart */);
return CLI_SUCCESS;
-}
-
-static char *handle_stop_when_convenient_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_stop_when_convenient(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "stop when convenient";
- return res;
}
static char *handle_restart_now(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -1673,14 +1649,6 @@
return CLI_SUCCESS;
}
-static char *handle_restart_now_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_restart_now(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "restart now";
- return res;
-}
-
static char *handle_restart_gracefully(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -1701,14 +1669,6 @@
return CLI_SUCCESS;
}
-static char *handle_restart_gracefully_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_restart_gracefully(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "restart gracefully";
- return res;
-}
-
static char *handle_restart_when_convenient(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -1727,14 +1687,6 @@
ast_cli(a->fd, "Waiting for inactivity to perform restart\n");
quit_handler(0, 2 /* really nicely */, 1 /* safely */, 1 /* restart */);
return CLI_SUCCESS;
-}
-
-static char *handle_restart_when_convenient_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_restart_when_convenient(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "restart when convenient";
- return res;
}
static char *handle_abort_shutdown(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -1756,14 +1708,6 @@
ast_cancel_shutdown();
shuttingdown = 0;
return CLI_SUCCESS;
-}
-
-static char *handle_abort_shutdown_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_abort_shutdown(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "abort shutdown";
- return res;
}
static char *handle_bang(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -1865,24 +1809,14 @@
#define ASTERISK_PROMPT2 "%s*CLI> "
-/* deprecated cli entries */
-static struct ast_cli_entry cli_abort_shutdown_deprecated = AST_CLI_DEFINE(handle_abort_shutdown_deprecated, "Cancel a running shutdown.");
-static struct ast_cli_entry cli_stop_now_deprecated = AST_CLI_DEFINE(handle_stop_now_deprecated, "Shut down Asterisk immediately.");
-static struct ast_cli_entry cli_stop_gracefully_deprecated = AST_CLI_DEFINE(handle_stop_gracefully_deprecated, "Gracefully shut down Asterisk.");
-static struct ast_cli_entry cli_stop_when_convenient_deprecated = AST_CLI_DEFINE(handle_stop_when_convenient_deprecated, "Shut down Asterisk at empty call volume.");
-static struct ast_cli_entry cli_restart_now_deprecated = AST_CLI_DEFINE(handle_restart_now_deprecated, "Restart Asterisk immediately.");
-static struct ast_cli_entry cli_restart_gracefully_deprecated = AST_CLI_DEFINE(handle_restart_gracefully_deprecated, "Restart Asterisk gracefully.");
-static struct ast_cli_entry cli_restart_when_convenient_deprecated = AST_CLI_DEFINE(handle_restart_when_convenient_deprecated, "Restart Asterisk at empty call volume.");
-/* end deprecated cli entries */
-
static struct ast_cli_entry cli_asterisk[] = {
- AST_CLI_DEFINE(handle_abort_shutdown, "Cancel a running shutdown", .deprecate_cmd = &cli_abort_shutdown_deprecated),
- AST_CLI_DEFINE(handle_stop_now, "Shut down Asterisk immediately", .deprecate_cmd = &cli_stop_now_deprecated),
- AST_CLI_DEFINE(handle_stop_gracefully, "Gracefully shut down Asterisk", .deprecate_cmd = &cli_stop_gracefully_deprecated),
- AST_CLI_DEFINE(handle_stop_when_convenient, "Shut down Asterisk at empty call volume", .deprecate_cmd = &cli_stop_when_convenient_deprecated),
- AST_CLI_DEFINE(handle_restart_now, "Restart Asterisk immediately", .deprecate_cmd = &cli_restart_now_deprecated),
- AST_CLI_DEFINE(handle_restart_gracefully, "Restart Asterisk gracefully", .deprecate_cmd = &cli_restart_gracefully_deprecated),
- AST_CLI_DEFINE(handle_restart_when_convenient, "Restart Asterisk at empty call volume", .deprecate_cmd = &cli_restart_when_convenient_deprecated),
+ AST_CLI_DEFINE(handle_abort_shutdown, "Cancel a running shutdown"),
+ AST_CLI_DEFINE(handle_stop_now, "Shut down Asterisk immediately"),
+ AST_CLI_DEFINE(handle_stop_gracefully, "Gracefully shut down Asterisk"),
+ AST_CLI_DEFINE(handle_stop_when_convenient, "Shut down Asterisk at empty call volume"),
+ AST_CLI_DEFINE(handle_restart_now, "Restart Asterisk immediately"),
+ AST_CLI_DEFINE(handle_restart_gracefully, "Restart Asterisk gracefully"),
+ AST_CLI_DEFINE(handle_restart_when_convenient, "Restart Asterisk at empty call volume"),
AST_CLI_DEFINE(show_warranty, "Show the warranty (if any) for this copy of Asterisk"),
AST_CLI_DEFINE(show_license, "Show the license(s) for this copy of Asterisk"),
AST_CLI_DEFINE(handle_version, "Display version info"),
Modified: team/group/res_clialiases/main/cdr.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/main/cdr.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/main/cdr.c (original)
+++ team/group/res_clialiases/main/cdr.c Sun Sep 28 22:54:48 2008
@@ -1334,14 +1334,6 @@
return CLI_SUCCESS;
}
-static char *handle_cli_status_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_cli_status(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "cdr status";
- return res;
-}
-
static char *handle_cli_submit(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -1364,8 +1356,7 @@
}
static struct ast_cli_entry cli_submit = AST_CLI_DEFINE(handle_cli_submit, "Posts all pending batched CDR data");
-static struct ast_cli_entry cli_status_deprecated = AST_CLI_DEFINE(handle_cli_status_deprecated, "Display the CDR status");
-static struct ast_cli_entry cli_status = AST_CLI_DEFINE(handle_cli_status, "Display the CDR status", .deprecate_cmd = &cli_status_deprecated);
+static struct ast_cli_entry cli_status = AST_CLI_DEFINE(handle_cli_status, "Display the CDR status");
static int do_reload(int reload)
{
Modified: team/group/res_clialiases/main/cli.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/main/cli.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/main/cli.c (original)
+++ team/group/res_clialiases/main/cli.c Sun Sep 28 22:54:48 2008
@@ -166,14 +166,6 @@
return CLI_SUCCESS;
}
-static char *handle_load_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_load(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "load";
- return res;
-}
-
static char *handle_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
int x;
@@ -207,14 +199,6 @@
}
}
return CLI_SUCCESS;
-}
-
-static char *handle_reload_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *s = handle_reload(e, cmd, a);
- if (cmd == CLI_INIT) /* override command name */
- e->command = "reload";
- return s;
}
/*!
@@ -426,14 +410,6 @@
}
}
return CLI_SUCCESS;
-}
-
-static char *handle_unload_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_unload(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "unload"; /* XXX override */
- return res;
}
#define MODLIST_FORMAT "%-30s %-40.40s %-10d\n"
@@ -946,18 +922,6 @@
}
ast_cli(a->fd, "Debugging on new channels is %s\n", is_off ? "disabled" : "enabled");
return CLI_SUCCESS;
-}
-
-static char *handle_debugchan_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res;
-
- if (cmd == CLI_HANDLER && a->argc != e->args + 1)
- return CLI_SHOWUSAGE;
- res = handle_core_set_debug_channel(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "debug channel";
- return res;
}
static char *handle_nodebugchan_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -1175,11 +1139,6 @@
#undef FORMAT_STRING
}
-static struct ast_cli_entry cli_debug_channel_deprecated = AST_CLI_DEFINE(handle_debugchan_deprecated, "Enable debugging on channel");
-static struct ast_cli_entry cli_module_load_deprecated = AST_CLI_DEFINE(handle_load_deprecated, "Load a module");
-static struct ast_cli_entry cli_module_reload_deprecated = AST_CLI_DEFINE(handle_reload_deprecated, "reload modules by name");
-static struct ast_cli_entry cli_module_unload_deprecated = AST_CLI_DEFINE(handle_unload_deprecated, "unload modules by name");
-
static char *handle_help(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
static struct ast_cli_entry cli_cli[] = {
@@ -1196,8 +1155,7 @@
AST_CLI_DEFINE(handle_showchan, "Display information on a specific channel"),
- AST_CLI_DEFINE(handle_core_set_debug_channel, "Enable/disable debugging on a channel",
- .deprecate_cmd = &cli_debug_channel_deprecated),
+ AST_CLI_DEFINE(handle_core_set_debug_channel, "Enable/disable debugging on a channel"),
AST_CLI_DEFINE(handle_verbose, "Set level of debug/verbose chattiness"),
@@ -1209,11 +1167,11 @@
AST_CLI_DEFINE(handle_modlist, "List modules and info"),
- AST_CLI_DEFINE(handle_load, "Load a module by name", .deprecate_cmd = &cli_module_load_deprecated),
-
- AST_CLI_DEFINE(handle_reload, "Reload configuration", .deprecate_cmd = &cli_module_reload_deprecated),
-
- AST_CLI_DEFINE(handle_unload, "Unload a module by name", .deprecate_cmd = &cli_module_unload_deprecated ),
+ AST_CLI_DEFINE(handle_load, "Load a module by name"),
+
+ AST_CLI_DEFINE(handle_reload, "Reload configuration"),
+
+ AST_CLI_DEFINE(handle_unload, "Unload a module by name"),
AST_CLI_DEFINE(handle_showuptime, "Show uptime information"),
Modified: team/group/res_clialiases/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/main/pbx.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/main/pbx.c (original)
+++ team/group/res_clialiases/main/pbx.c Sun Sep 28 22:54:48 2008
@@ -5417,15 +5417,6 @@
return CLI_SUCCESS;
}
-static char *handle_show_globals_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
-
- char *res = handle_show_globals(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "core show globals";
- return res;
-}
-
/*! \brief CLI support for listing chanvar's variables in a parseable way */
static char *handle_show_chanvar(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
@@ -5481,14 +5472,6 @@
return CLI_SUCCESS;
}
-static char *handle_set_global_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_set_global(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "core set global";
- return res;
-}
-
static char *handle_set_chanvar(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct ast_channel *chan;
@@ -5522,14 +5505,6 @@
ast_cli(a->fd, "\n -- Channel variable '%s' set to '%s' for '%s'\n", var_name, var_value, chan_name);
return CLI_SUCCESS;
-}
-
-static char *handle_set_chanvar_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- char *res = handle_set_chanvar(e, cmd, a);
- if (cmd == CLI_INIT)
- e->command = "core set chanvar";
- return res;
}
static char *handle_set_extenpatternmatchnew(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
@@ -5589,14 +5564,6 @@
}
/*
- * Deprecated CLI commands
- */
-
-static struct ast_cli_entry cli_show_globals_deprecated = AST_CLI_DEFINE(handle_show_globals_deprecated, "Show global dialplan variables.");
-static struct ast_cli_entry cli_set_chanvar_deprecated = AST_CLI_DEFINE(handle_set_chanvar_deprecated, "Set a channel variable.");
-static struct ast_cli_entry cli_set_global_deprecated = AST_CLI_DEFINE(handle_set_global_deprecated, "Set global dialplan variable.");
-
-/*
* CLI entries for upper commands ...
*/
static struct ast_cli_entry pbx_cli[] = {
@@ -5605,12 +5572,12 @@
AST_CLI_DEFINE(handle_show_switches, "Show alternative switches"),
AST_CLI_DEFINE(handle_show_hints, "Show dialplan hints"),
AST_CLI_DEFINE(handle_show_hint, "Show dialplan hint"),
- AST_CLI_DEFINE(handle_show_globals, "Show global dialplan variables", .deprecate_cmd = &cli_show_globals_deprecated),
+ AST_CLI_DEFINE(handle_show_globals, "Show global dialplan variables"),
AST_CLI_DEFINE(handle_show_chanvar, "Show channel variables"),
AST_CLI_DEFINE(handle_show_function, "Describe a specific dialplan function"),
AST_CLI_DEFINE(handle_show_application, "Describe a specific dialplan application"),
- AST_CLI_DEFINE(handle_set_global, "Set global dialplan variable", .deprecate_cmd = &cli_set_global_deprecated),
- AST_CLI_DEFINE(handle_set_chanvar, "Set a channel variable", .deprecate_cmd = &cli_set_chanvar_deprecated),
+ AST_CLI_DEFINE(handle_set_global, "Set global dialplan variable"),
+ AST_CLI_DEFINE(handle_set_chanvar, "Set a channel variable"),
AST_CLI_DEFINE(handle_show_dialplan, "Show dialplan"),
AST_CLI_DEFINE(handle_unset_extenpatternmatchnew, "Use the Old extension pattern matching algorithm."),
AST_CLI_DEFINE(handle_set_extenpatternmatchnew, "Use the New extension pattern matching algorithm."),
Modified: team/group/res_clialiases/main/rtp.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/main/rtp.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/main/rtp.c (original)
+++ team/group/res_clialiases/main/rtp.c Sun Sep 28 22:54:48 2008
@@ -4439,41 +4439,6 @@
return CLI_SUCCESS;
}
-static char *handle_cli_rtp_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "rtp debug [off|ip]";
- e->usage =
- "Usage: rtp debug [off]|[ip host[:port]]\n"
- " Enable/Disable dumping of all RTP packets. If 'ip' is\n"
- " specified, limit the dumped packets to those to and from\n"
- " the specified 'host' with optional port.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 2 || a->argc > 4)
- return CLI_SHOWUSAGE;
- if (a->argc == 2) {
- rtpdebug = 1;
- memset(&rtpdebugaddr, 0, sizeof(rtpdebugaddr));
- ast_cli(a->fd, "RTP Debugging Enabled\n");
- } else if (a->argc == 3) {
- if (strncasecmp(a->argv[2], "off", 3))
- return CLI_SHOWUSAGE;
- rtpdebug = 0;
- ast_cli(a->fd, "RTP Debugging Disabled\n");
- } else {
- if (strncasecmp(a->argv[2], "ip", 2))
- return CLI_SHOWUSAGE;
- return rtp_do_debug_ip(a);
- }
-
- return CLI_SUCCESS;
-}
-
static char *handle_cli_rtp_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -4507,41 +4472,6 @@
return CLI_SHOWUSAGE; /* default, failure */
}
-static char *handle_cli_rtcp_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "rtcp debug [off|ip]";
- e->usage =
- "Usage: rtcp debug [off]|[ip host[:port]]\n"
- " Enable/Disable dumping of all RTCP packets. If 'ip' is\n"
- " specified, limit the dumped packets to those to and from\n"
- " the specified 'host' with optional port.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 2 || a->argc > 4)
- return CLI_SHOWUSAGE;
- if (a->argc == 2) {
- rtcpdebug = 1;
- memset(&rtcpdebugaddr, 0, sizeof(rtcpdebugaddr));
- ast_cli(a->fd, "RTCP Debugging Enabled\n");
- } else if (a->argc == 3) {
- if (strncasecmp(a->argv[2], "off", 3))
- return CLI_SHOWUSAGE;
- rtcpdebug = 0;
- ast_cli(a->fd, "RTCP Debugging Disabled\n");
- } else {
- if (strncasecmp(a->argv[2], "ip", 2))
- return CLI_SHOWUSAGE;
- return rtcp_do_debug_ip(a);
- }
-
- return CLI_SUCCESS;
-}
-
static char *handle_cli_rtcp_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -4575,29 +4505,6 @@
return CLI_SHOWUSAGE; /* default, failure */
}
-static char *handle_cli_rtcp_stats_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "rtcp stats [off]";
- e->usage =
- "Usage: rtcp stats [off]\n"
- " Enable/Disable dumping of RTCP stats.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 2 || a->argc > 3)
- return CLI_SHOWUSAGE;
- if (a->argc == 3 && strncasecmp(a->argv[2], "off", 3))
- return CLI_SHOWUSAGE;
-
- rtcpstats = (a->argc == 3) ? 0 : 1;
- ast_cli(a->fd, "RTCP Stats %s\n", rtcpstats ? "Enabled" : "Disabled");
- return CLI_SUCCESS;
-}
-
static char *handle_cli_rtcp_set_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -4622,30 +4529,6 @@
return CLI_SHOWUSAGE;
ast_cli(a->fd, "RTCP Stats %s\n", rtcpstats ? "Enabled" : "Disabled");
- return CLI_SUCCESS;
-}
-
-static char *handle_cli_stun_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "stun debug [off]";
- e->usage =
- "Usage: stun debug [off]\n"
- " Enable/Disable STUN (Simple Traversal of UDP through NATs)\n"
- " debugging\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 2 || a->argc > 3)
- return CLI_SHOWUSAGE;
- if (a->argc == 3 && strncasecmp(a->argv[2], "off", 3))
- return CLI_SHOWUSAGE;
-
- stundebug = (a->argc == 3) ? 0 : 1;
- ast_cli(a->fd, "STUN Debugging %s\n", stundebug ? "Enabled" : "Disabled");
return CLI_SUCCESS;
}
@@ -4677,16 +4560,11 @@
return CLI_SUCCESS;
}
-static struct ast_cli_entry cli_rtp_debug_deprecated = AST_CLI_DEFINE(handle_cli_rtp_debug_deprecated, "Enable/Disable RTP debugging");
-static struct ast_cli_entry cli_rtcp_debug_deprecated = AST_CLI_DEFINE(handle_cli_rtcp_debug_deprecated, "Enable/Disable RTCP debugging");
-static struct ast_cli_entry cli_rtcp_stats_deprecated = AST_CLI_DEFINE(handle_cli_rtcp_stats_deprecated, "Enable/Disable RTCP stats");
-static struct ast_cli_entry cli_stun_debug_deprecated = AST_CLI_DEFINE(handle_cli_stun_debug_deprecated, "Enable/Disable STUN debugging");
-
static struct ast_cli_entry cli_rtp[] = {
- AST_CLI_DEFINE(handle_cli_rtp_set_debug, "Enable/Disable RTP debugging", .deprecate_cmd = &cli_rtp_debug_deprecated),
- AST_CLI_DEFINE(handle_cli_rtcp_set_debug, "Enable/Disable RTCP debugging", .deprecate_cmd = &cli_rtcp_debug_deprecated),
- AST_CLI_DEFINE(handle_cli_rtcp_set_stats, "Enable/Disable RTCP stats", .deprecate_cmd = &cli_rtcp_stats_deprecated),
- AST_CLI_DEFINE(handle_cli_stun_set_debug, "Enable/Disable STUN debugging", .deprecate_cmd = &cli_stun_debug_deprecated),
+ AST_CLI_DEFINE(handle_cli_rtp_set_debug, "Enable/Disable RTP debugging"),
+ AST_CLI_DEFINE(handle_cli_rtcp_set_debug, "Enable/Disable RTCP debugging"),
+ AST_CLI_DEFINE(handle_cli_rtcp_set_stats, "Enable/Disable RTCP stats"),
+ AST_CLI_DEFINE(handle_cli_stun_set_debug, "Enable/Disable STUN debugging"),
};
static int __ast_rtp_reload(int reload)
Modified: team/group/res_clialiases/main/udptl.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/main/udptl.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/main/udptl.c (original)
+++ team/group/res_clialiases/main/udptl.c Sun Sep 28 22:54:48 2008
@@ -1089,7 +1089,7 @@
return -1;
}
-static char *handle_cli_udptl_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+static char *handle_cli_udptl_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct hostent *hp;
struct ast_hostent ahp;
@@ -1099,9 +1099,9 @@
switch (cmd) {
case CLI_INIT:
- e->command = "udptl debug [off|ip]";
+ e->command = "udptl set debug {on|off|ip}";
e->usage =
- "Usage: udptl debug [off]|[ip host[:port]]\n"
+ "Usage: udptl set debug {on|off|ip host[:port]}\n"
" Enable or disable dumping of UDPTL packets.\n"
" If ip is specified, limit the dumped packets to those to and from\n"
" the specified 'host' with optional port.\n";
@@ -1110,23 +1110,25 @@
return NULL;
}
- if (a->argc < 2 || a->argc > 4)
+ if (a->argc < 4 || a->argc > 5)
return CLI_SHOWUSAGE;
- if (a->argc == 2) {
- udptldebug = 1;
- memset(&udptldebugaddr, 0, sizeof(udptldebugaddr));
- ast_cli(a->fd, "UDPTL Debugging Enabled\n");
- } else if (a->argc == 3) {
- if (strncasecmp(a->argv[2], "off", 3))
+ if (a->argc == 4) {
+ if (!strncasecmp(a->argv[3], "on", 2)) {
+ udptldebug = 1;
+ memset(&udptldebugaddr, 0, sizeof(udptldebugaddr));
+ ast_cli(a->fd, "UDPTL Debugging Enabled\n");
+ } else if (!strncasecmp(a->argv[3], "off", 3)) {
+ udptldebug = 0;
+ ast_cli(a->fd, "UDPTL Debugging Disabled\n");
+ } else {
return CLI_SHOWUSAGE;
- udptldebug = 0;
- ast_cli(a->fd, "UDPTL Debugging Disabled\n");
+ }
} else {
- if (strncasecmp(a->argv[2], "ip", 2))
+ if (strncasecmp(a->argv[3], "ip", 2))
return CLI_SHOWUSAGE;
port = 0;
- arg = a->argv[3];
+ arg = a->argv[4];
p = strstr(arg, ":");
if (p) {
*p = '\0';
@@ -1149,72 +1151,9 @@
return CLI_SUCCESS;
}
-static char *handle_cli_udptl_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- struct hostent *hp;
- struct ast_hostent ahp;
- int port;
- char *p;
- char *arg;
-
- switch (cmd) {
- case CLI_INIT:
- e->command = "udptl set debug {on|off|ip}";
- e->usage =
- "Usage: udptl set debug {on|off|ip host[:port]}\n"
- " Enable or disable dumping of UDPTL packets.\n"
- " If ip is specified, limit the dumped packets to those to and from\n"
- " the specified 'host' with optional port.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc < 4 || a->argc > 5)
- return CLI_SHOWUSAGE;
-
- if (a->argc == 4) {
- if (!strncasecmp(a->argv[3], "on", 2)) {
- udptldebug = 1;
- memset(&udptldebugaddr, 0, sizeof(udptldebugaddr));
- ast_cli(a->fd, "UDPTL Debugging Enabled\n");
- } else if (!strncasecmp(a->argv[3], "off", 3)) {
- udptldebug = 0;
- ast_cli(a->fd, "UDPTL Debugging Disabled\n");
- } else {
- return CLI_SHOWUSAGE;
- }
- } else {
- if (strncasecmp(a->argv[3], "ip", 2))
- return CLI_SHOWUSAGE;
- port = 0;
- arg = a->argv[4];
- p = strstr(arg, ":");
- if (p) {
- *p = '\0';
- p++;
- port = atoi(p);
- }
- hp = ast_gethostbyname(arg, &ahp);
- if (hp == NULL)
- return CLI_SHOWUSAGE;
- udptldebugaddr.sin_family = AF_INET;
- memcpy(&udptldebugaddr.sin_addr, hp->h_addr, sizeof(udptldebugaddr.sin_addr));
- udptldebugaddr.sin_port = htons(port);
- if (port == 0)
- ast_cli(a->fd, "UDPTL Debugging Enabled for IP: %s\n", ast_inet_ntoa(udptldebugaddr.sin_addr));
- else
- ast_cli(a->fd, "UDPTL Debugging Enabled for IP: %s:%d\n", ast_inet_ntoa(udptldebugaddr.sin_addr), port);
- udptldebug = 1;
- }
-
- return CLI_SUCCESS;
-}
-
-static struct ast_cli_entry cli_handle_udptl_debug_deprecated = AST_CLI_DEFINE(handle_cli_udptl_debug_deprecated, "Enable/Disable UDPTL debugging");
static struct ast_cli_entry cli_udptl[] = {
- AST_CLI_DEFINE(handle_cli_udptl_set_debug, "Enable/Disable UDPTL debugging", .deprecate_cmd = &cli_handle_udptl_debug_deprecated)
+ AST_CLI_DEFINE(handle_cli_udptl_set_debug, "Enable/Disable UDPTL debugging")
};
static void __ast_udptl_reload(int reload)
Modified: team/group/res_clialiases/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/pbx/pbx_ael.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/pbx/pbx_ael.c (original)
+++ team/group/res_clialiases/pbx/pbx_ael.c Sun Sep 28 22:54:48 2008
@@ -153,40 +153,6 @@
}
/* CLI interface */
-static char *handle_cli_ael_debug_multiple_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "ael debug [read|tokens|macros|contexts|off]";
- e->usage =
- "Usage: ael debug [read|tokens|macros|contexts|off]\n"
- " Enable AEL read, token, macro, or context debugging,\n"
- " or disable all AEL debugging messages. Note: this\n"
- " currently does nothing.\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
-
- if (a->argc != 3)
- return CLI_SHOWUSAGE;
-
- if (!strcasecmp(a->argv[2], "read"))
- aeldebug |= DEBUG_READ;
- else if (!strcasecmp(a->argv[2], "tokens"))
- aeldebug |= DEBUG_TOKENS;
- else if (!strcasecmp(a->argv[2], "macros"))
- aeldebug |= DEBUG_MACROS;
- else if (!strcasecmp(a->argv[2], "contexts"))
- aeldebug |= DEBUG_CONTEXTS;
- else if (!strcasecmp(a->argv[2], "off"))
- aeldebug = 0;
- else
- return CLI_SHOWUSAGE;
-
- return CLI_SUCCESS;
-}
-
static char *handle_cli_ael_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -240,10 +206,9 @@
return (pbx_load_module() ? CLI_FAILURE : CLI_SUCCESS);
}
-static struct ast_cli_entry cli_ael_debug_multiple_deprecated = AST_CLI_DEFINE(handle_cli_ael_debug_multiple_deprecated, "Enable AEL debugging flags");
static struct ast_cli_entry cli_ael[] = {
AST_CLI_DEFINE(handle_cli_ael_reload, "Reload AEL configuration"),
- AST_CLI_DEFINE(handle_cli_ael_set_debug, "Enable AEL debugging flags", .deprecate_cmd = &cli_ael_debug_multiple_deprecated)
+ AST_CLI_DEFINE(handle_cli_ael_set_debug, "Enable AEL debugging flags")
};
static int unload_module(void)
Modified: team/group/res_clialiases/pbx/pbx_dundi.c
URL: http://svn.digium.com/view/asterisk/team/group/res_clialiases/pbx/pbx_dundi.c?view=diff&rev=145166&r1=145165&r2=145166
==============================================================================
--- team/group/res_clialiases/pbx/pbx_dundi.c (original)
+++ team/group/res_clialiases/pbx/pbx_dundi.c Sun Sep 28 22:54:48 2008
@@ -2156,30 +2156,6 @@
return 0;
}
-static char *dundi_do_debug_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "dundi [no] debug";
- e->usage =
- "Usage: dundi [no] debug\n"
- " Enables/Disables dumping of DUNDi packets for debugging purposes\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
- if (a->argc < 2 || a->argc > 3)
- return CLI_SHOWUSAGE;
- if (a->argc == 2) {
- dundidebug = 1;
- ast_cli(a->fd, "DUNDi Debugging Enabled\n");
- } else {
- dundidebug = 0;
- ast_cli(a->fd, "DUNDi Debugging Disabled\n");
- }
- return CLI_SUCCESS;
-}
-
static char *dundi_set_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
switch (cmd) {
@@ -2202,32 +2178,6 @@
} else {
dundidebug = 0;
ast_cli(a->fd, "DUNDi Debugging Disabled\n");
- }
- return CLI_SUCCESS;
-}
-
-static char *dundi_do_store_history_deprecated(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-{
- switch (cmd) {
- case CLI_INIT:
- e->command = "dundi [no] store history";
- e->usage =
- "Usage: dundi [no] store history\n"
- " Enables/Disables storing of DUNDi requests and times for debugging\n"
- "purposes\n";
- return NULL;
- case CLI_GENERATE:
- return NULL;
- }
- if (a->argc < 3 || a->argc > 4)
- return CLI_SHOWUSAGE;
-
- if (a->argc == 3) {
- global_storehistory = 1;
- ast_cli(a->fd, "DUNDi History Storage Enabled\n");
- } else {
- global_storehistory = 0;
- ast_cli(a->fd, "DUNDi History Storage Disabled\n");
}
return CLI_SUCCESS;
}
@@ -2819,11 +2769,9 @@
#undef FORMAT2
}
-static struct ast_cli_entry cli_dundi_do_debug_deprecated = AST_CLI_DEFINE(dundi_do_debug_deprecated, "Enable/Disable DUNDi debugging");
[... 134 lines stripped ...]
More information about the asterisk-commits
mailing list