[svn-commits] oej: branch oej/iaxtrunkfix-1.4 r47191 - in
/team/oej/iaxtrunkfix-1.4: ./ app...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Nov 4 09:31:16 MST 2006
Author: oej
Date: Sat Nov 4 10:31:16 2006
New Revision: 47191
URL: http://svn.digium.com/view/asterisk?rev=47191&view=rev
Log:
Reset automerge
Modified:
team/oej/iaxtrunkfix-1.4/ (props changed)
team/oej/iaxtrunkfix-1.4/apps/app_queue.c
team/oej/iaxtrunkfix-1.4/apps/app_voicemail.c
team/oej/iaxtrunkfix-1.4/bootstrap.sh
team/oej/iaxtrunkfix-1.4/channels/chan_agent.c
team/oej/iaxtrunkfix-1.4/channels/chan_features.c
team/oej/iaxtrunkfix-1.4/channels/chan_h323.c
team/oej/iaxtrunkfix-1.4/channels/chan_iax2.c
team/oej/iaxtrunkfix-1.4/channels/chan_local.c
team/oej/iaxtrunkfix-1.4/channels/chan_mgcp.c
team/oej/iaxtrunkfix-1.4/channels/chan_sip.c
team/oej/iaxtrunkfix-1.4/channels/chan_skinny.c
team/oej/iaxtrunkfix-1.4/configure.ac
team/oej/iaxtrunkfix-1.4/main/asterisk.c
team/oej/iaxtrunkfix-1.4/main/channel.c
team/oej/iaxtrunkfix-1.4/main/cli.c
team/oej/iaxtrunkfix-1.4/main/config.c
team/oej/iaxtrunkfix-1.4/main/file.c
team/oej/iaxtrunkfix-1.4/main/frame.c
team/oej/iaxtrunkfix-1.4/main/http.c
team/oej/iaxtrunkfix-1.4/main/image.c
team/oej/iaxtrunkfix-1.4/main/logger.c
team/oej/iaxtrunkfix-1.4/main/manager.c
team/oej/iaxtrunkfix-1.4/main/pbx.c
team/oej/iaxtrunkfix-1.4/main/rtp.c
team/oej/iaxtrunkfix-1.4/main/udptl.c
team/oej/iaxtrunkfix-1.4/res/res_agi.c
team/oej/iaxtrunkfix-1.4/res/res_crypto.c
team/oej/iaxtrunkfix-1.4/res/res_features.c
team/oej/iaxtrunkfix-1.4/res/res_indications.c
team/oej/iaxtrunkfix-1.4/res/res_jabber.c
team/oej/iaxtrunkfix-1.4/res/res_musiconhold.c
team/oej/iaxtrunkfix-1.4/res/res_odbc.c
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/iaxtrunkfix-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Nov 4 10:31:16 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-47019
+/branches/1.4:1-47190
Modified: team/oej/iaxtrunkfix-1.4/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/apps/app_queue.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/apps/app_queue.c (original)
+++ team/oej/iaxtrunkfix-1.4/apps/app_queue.c Sat Nov 4 10:31:16 2006
@@ -3866,12 +3866,12 @@
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;
@@ -3880,7 +3880,11 @@
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. */
@@ -3994,14 +3998,9 @@
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)
@@ -4028,9 +4027,9 @@
*/
static int manager_queues_show( struct mansession *s, struct message *m )
{
- char *a[] = { "queue", "list" };
-
- __queues_show(s, 1, -1, 2, a, 0);
+ char *a[] = { "queue", "show" };
+
+ __queues_show(s, 1, -1, 2, a);
astman_append(s, "\r\n\r\n"); /* Properly terminate Manager output */
return RESULT_SUCCESS;
@@ -4381,10 +4380,6 @@
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";
@@ -4394,11 +4389,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_list, NULL,
- NULL, NULL };
static struct ast_cli_entry cli_show_queue_deprecated = {
{ "show", "queue", NULL },
@@ -4416,9 +4406,10 @@
NULL, complete_queue_remove_member };
static struct ast_cli_entry cli_queue[] = {
- { { "queue", "list", NULL },
- queue_list, "Show status of queues",
- queue_list_usage, NULL, &cli_show_queues_deprecated },
+ /* Deprecated */
+ { { "show", "queues", NULL },
+ queue_show, NULL,
+ NULL, NULL },
{ { "queue", "show", NULL },
queue_show, "Show status of a specified queue",
Modified: team/oej/iaxtrunkfix-1.4/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/apps/app_voicemail.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/apps/app_voicemail.c (original)
+++ team/oej/iaxtrunkfix-1.4/apps/app_voicemail.c Sat Nov 4 10:31:16 2006
@@ -6645,11 +6645,11 @@
}
static char voicemail_show_users_help[] =
-"Usage: voicemail list users [for <context>]\n"
+"Usage: voicemail show users [for <context>]\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[])
@@ -6766,11 +6766,11 @@
NULL, NULL };
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, &cli_show_voicemail_users_deprecated },
- { { "voicemail", "list", "zones", NULL },
+ { { "voicemail", "show", "zones", NULL },
handle_voicemail_show_zones, "List zone message formats",
voicemail_show_zones_help, NULL, &cli_show_voicemail_zones_deprecated },
};
Modified: team/oej/iaxtrunkfix-1.4/bootstrap.sh
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/bootstrap.sh?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/bootstrap.sh (original)
+++ team/oej/iaxtrunkfix-1.4/bootstrap.sh Sat Nov 4 10:31:16 2006
@@ -9,33 +9,32 @@
fi
}
+# On FreeBSD, multiple autoconf/automake versions have different names.
+# On linux, envitonment variables tell which one to use.
+
uname -s | grep -q FreeBSD
-if [ $? = 0 ]
-then
- check_for_app autoconf260
- check_for_app autoheader260
- check_for_app automake19
- check_for_app aclocal19
- echo "Generating the configure script ..."
- aclocal19 2>/dev/null
- autoconf260
- autoheader260
- automake19 --add-missing --copy 2>/dev/null
-else
+if [ $? = 0 ] ; then # FreeBSD case
+ MY_AC_VER=259
+ MY_AM_VER=19
+else # linux case
+ MY_AC_VER=
+ MY_AM_VER=
AUTOCONF_VERSION=2.60
AUTOMAKE_VERSION=1.9
export AUTOCONF_VERSION
export AUTOMAKE_VERSION
-
- check_for_app autoconf
- check_for_app autoheader
- check_for_app automake
- check_for_app aclocal
- echo "Generating the configure script ..."
- aclocal 2>/dev/null
- autoconf
- autoheader
- automake --add-missing --copy 2>/dev/null
fi
+check_for_app autoconf${MY_AC_VER}
+check_for_app autoheader${MY_AC_VER}
+check_for_app automake${MY_AM_VER}
+check_for_app aclocal${MY_AM_VER}
+
+echo "Generating the configure script ..."
+
+aclocal${MY_AM_VER} 2>/dev/null
+autoconf${MY_AC_VER}
+autoheader${MY_AC_VER}
+automake${MY_AM_VER} --add-missing --copy 2>/dev/null
+
exit 0
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_agent.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_agent.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_agent.c Sat Nov 4 10:31:16 2006
@@ -1721,11 +1721,11 @@
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[] =
@@ -1744,11 +1744,11 @@
NULL, NULL };
static struct ast_cli_entry cli_agents[] = {
- { { "agent", "list", NULL },
+ { { "agent", "show", NULL },
agents_show, "Show status of agents",
show_agents_usage, NULL, &cli_show_agents_deprecated },
- { { "agent", "list", "online" },
+ { { "agent", "show", "online" },
agents_show_online, "Show all online agents",
show_agents_online_usage, NULL, &cli_show_agents_online_deprecated },
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_features.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_features.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_features.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_features.c Sat Nov 4 10:31:16 2006
@@ -530,18 +530,13 @@
}
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_show_channels_deprecated = {
- { "feature", "show", "channels", NULL },
- features_show, NULL,
- NULL };
-
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, NULL, &cli_features_show_channels_deprecated },
+ show_features_usage },
};
static int load_module(void)
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_h323.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_h323.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_h323.c Sat Nov 4 10:31:16 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: team/oej/iaxtrunkfix-1.4/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_iax2.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_iax2.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_iax2.c Sat Nov 4 10:31:16 2006
@@ -4481,7 +4481,7 @@
return RESULT_SUCCESS;
}
-static int iax2_no_debug_deprecated(int fd, int argc, char *argv[])
+static int iax2_no_debug(int fd, int argc, char *argv[])
{
if (argc != 3)
return RESULT_SHOWUSAGE;
@@ -4490,16 +4490,7 @@
return RESULT_SUCCESS;
}
-static int iax2_no_debug(int fd, int argc, char *argv[])
-{
- if (argc != 2)
- return RESULT_SHOWUSAGE;
- iaxdebug = 0;
- ast_cli(fd, "IAX2 Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
-static int iax2_no_trunk_debug_deprecated(int fd, int argc, char *argv[])
+static int iax2_no_trunk_debug(int fd, int argc, char *argv[])
{
if (argc != 4)
return RESULT_SHOWUSAGE;
@@ -4508,28 +4499,9 @@
return RESULT_SUCCESS;
}
-static int iax2_no_trunk_debug(int fd, int argc, char *argv[])
-{
- if (argc != 3)
- return RESULT_SHOWUSAGE;
- iaxtrunkdebug = 0;
- ast_cli(fd, "IAX2 Trunk Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
-static int iax2_no_jb_debug_deprecated(int fd, int argc, char *argv[])
+static int iax2_no_jb_debug(int fd, int argc, char *argv[])
{
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");
- return RESULT_SUCCESS;
-}
-
-static int iax2_no_jb_debug(int fd, int argc, char *argv[])
-{
- if (argc != 3)
return RESULT_SHOWUSAGE;
jb_setoutput(jb_error_output, jb_warning_output, NULL);
jb_debug_output("\n");
@@ -9709,7 +9681,7 @@
};
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[] =
@@ -9720,7 +9692,7 @@
" 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[] =
@@ -9743,34 +9715,34 @@
" 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[] =
@@ -9827,17 +9799,17 @@
static struct ast_cli_entry cli_iax2_no_debug_deprecated = {
{ "iax2", "no", "debug", NULL },
- iax2_no_debug_deprecated, NULL,
+ iax2_no_debug, NULL,
NULL };
static struct ast_cli_entry cli_iax2_no_trunk_debug_deprecated = {
{ "iax2", "no", "trunk", "debug", NULL },
- iax2_no_trunk_debug_deprecated, NULL,
+ iax2_no_trunk_debug, NULL,
NULL };
static struct ast_cli_entry cli_iax2_no_jb_debug_deprecated = {
{ "iax2", "no", "jb", "debug", NULL },
- iax2_no_jb_debug_deprecated, NULL,
+ iax2_no_jb_debug, NULL,
NULL };
static struct ast_cli_entry cli_iax2_show_cache_deprecated = {
@@ -9885,35 +9857,35 @@
show_reg_usage };
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, NULL, &cli_iax2_show_cache_deprecated },
- { { "iax2", "list", "channels", NULL },
+ { { "iax2", "show", "channels", NULL },
iax2_show_channels, "List active IAX channels",
show_channels_usage, NULL, &cli_iax2_show_channels_deprecated },
- { { "iax2", "list", "firmware", NULL },
+ { { "iax2", "show", "firmware", NULL },
iax2_show_firmware, "List available IAX firmwares",
show_firmware_usage, NULL, &cli_iax2_show_firmware_deprecated },
- { { "iax2", "list", "netstats", NULL },
+ { { "iax2", "show", "netstats", NULL },
iax2_show_netstats, "List active IAX channel netstats",
show_netstats_usage, NULL, &cli_iax2_show_netstats_deprecated },
- { { "iax2", "list", "peers", NULL },
+ { { "iax2", "show", "peers", NULL },
iax2_show_peers, "List defined IAX peers",
show_peers_usage, NULL, &cli_iax2_show_peers_deprecated },
- { { "iax2", "list", "registry", NULL },
+ { { "iax2", "show", "registry", NULL },
iax2_show_registry, "Display IAX registration status",
show_reg_usage, NULL, &cli_iax2_show_registry_deprecated },
- { { "iax2", "list", "stats", NULL },
+ { { "iax2", "show", "stats", NULL },
iax2_show_stats, "Display IAX statistics",
show_stats_usage, NULL, &cli_iax2_show_stats_deprecated },
- { { "iax2", "list", "threads", NULL },
+ { { "iax2", "show", "threads", NULL },
iax2_show_threads, "Display IAX helper thread info",
show_threads_usage, NULL, &cli_iax2_show_threads_deprecated },
@@ -9921,7 +9893,7 @@
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, NULL, &cli_iax2_show_users_deprecated },
@@ -9949,15 +9921,15 @@
iax2_do_jb_debug, "Enable IAX jitterbuffer debugging",
debug_jb_usage, NULL, &cli_iax2_jb_debug_deprecated },
- { { "iax2", "nodebug", NULL },
+ { { "iax2", "debug", "off", NULL },
iax2_no_debug, "Disable IAX debugging",
no_debug_usage, NULL, &cli_iax2_no_debug_deprecated },
- { { "iax2", "nodebug", "trunk", NULL },
+ { { "iax2", "debug", "trunk", "off", NULL },
iax2_no_trunk_debug, "Disable IAX trunk debugging",
no_debug_trunk_usage, NULL, &cli_iax2_no_trunk_debug_deprecated },
- { { "iax2", "nodebug", "jb", NULL },
+ { { "iax2", "debug", "jb", "off", NULL },
iax2_no_jb_debug, "Disable IAX jitterbuffer debugging",
no_debug_jb_usage, NULL, &cli_iax2_no_jb_debug_deprecated },
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_local.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_local.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_local.c Sat Nov 4 10:31:16 2006
@@ -626,18 +626,13 @@
}
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_show_channels_deprecated = {
- { "local", "show", "channels", NULL },
- locals_show, NULL,
- NULL };
-
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, NULL, &cli_local_show_channels_deprecated },
+ show_locals_usage },
};
/*! \brief Load module into PBX, register channel */
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_mgcp.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_mgcp.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_mgcp.c Sat Nov 4 10:31:16 2006
@@ -1040,11 +1040,11 @@
}
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";
@@ -1053,12 +1053,13 @@
" 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[])
{
@@ -1122,7 +1123,7 @@
return RESULT_SUCCESS;
}
-static int mgcp_no_debug_deprecated(int fd, int argc, char *argv[])
+static int mgcp_no_debug(int fd, int argc, char *argv[])
{
if (argc != 3)
return RESULT_SHOWUSAGE;
@@ -1131,46 +1132,22 @@
return RESULT_SUCCESS;
}
-static int mgcp_no_debug(int fd, int argc, char *argv[])
-{
- if (argc != 2)
- return RESULT_SHOWUSAGE;
- mgcpdebug = 0;
- ast_cli(fd, "MGCP Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
-static struct ast_cli_entry cli_mgcp_no_debug_deprecated = {
- { "mgcp", "no", "debug", NULL },
- mgcp_no_debug_deprecated, NULL,
- NULL };
-
-static struct ast_cli_entry cli_mgcp_audit_endpoint_deprecated = {
- { "mgcp", "audit", "endpoint", NULL },
- mgcp_audit_endpoint, NULL,
- NULL };
-
-static struct ast_cli_entry cli_mgcp_show_endpoints_deprecated = {
- { "mgcp", "show", "endpoints", NULL },
- mgcp_show_endpoints, NULL,
- NULL };
-
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, NULL, &cli_mgcp_audit_endpoint_deprecated },
-
- { { "mgcp", "endpoint", "list", NULL },
+ audit_endpoint_usage },
+
+ { { "mgcp", "show", "endpoints", NULL },
mgcp_show_endpoints, "List defined MGCP endpoints",
- show_endpoints_usage, NULL, &cli_mgcp_show_endpoints_deprecated },
+ show_endpoints_usage },
{ { "mgcp", "debug", NULL },
mgcp_do_debug, "Enable MGCP debugging",
debug_usage },
- { { "mgcp", "nodebug", NULL },
+ { { "mgcp", "debug", "off", NULL },
mgcp_no_debug, "Disable MGCP debugging",
- no_debug_usage, NULL, &cli_mgcp_no_debug_deprecated },
+ no_debug_usage },
{ { "mgcp", "reload", NULL },
mgcp_reload, "Reload MGCP configuration",
@@ -4305,6 +4282,12 @@
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");
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_sip.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_sip.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_sip.c Sat Nov 4 10:31:16 2006
@@ -5813,6 +5813,10 @@
if (fmt.cur_ms && (fmt.cur_ms < *min_packet_size))
*min_packet_size = fmt.cur_ms;
+
+ /* Our first codec packetization processed cannot be less than zero */
+ if ((*min_packet_size) == 0 && fmt.cur_ms)
+ *min_packet_size = fmt.cur_ms;
}
/*! \brief Get Max T.38 Transmission rate from T38 capabilities */
@@ -10757,7 +10761,7 @@
}
/*! \brief Disable SIP Debugging in CLI */
-static int sip_no_debug_deprecated(int fd, int argc, char *argv[])
+static int sip_no_debug(int fd, int argc, char *argv[])
{
if (argc != 3)
return RESULT_SHOWUSAGE;
@@ -10766,15 +10770,6 @@
return RESULT_SUCCESS;
}
-static int sip_no_debug(int fd, int argc, char *argv[])
-{
- if (argc != 2)
- return RESULT_SHOWUSAGE;
- ast_clear_flag(&global_flags[1], SIP_PAGE2_DEBUG_CONSOLE);
- ast_cli(fd, "SIP Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
/*! \brief Enable SIP History logging (CLI) */
static int sip_do_history(int fd, int argc, char *argv[])
{
@@ -10787,19 +10782,9 @@
}
/*! \brief Disable SIP History logging (CLI) */
-static int sip_no_history_deprecated(int fd, int argc, char *argv[])
+static int sip_no_history(int fd, int argc, char *argv[])
{
if (argc != 3) {
- return RESULT_SHOWUSAGE;
- }
- recordhistory = FALSE;
- ast_cli(fd, "SIP History Recording Disabled\n");
- return RESULT_SUCCESS;
-}
-
-static int sip_no_history(int fd, int argc, char *argv[])
-{
- if (argc != 2) {
return RESULT_SHOWUSAGE;
}
recordhistory = FALSE;
@@ -10995,7 +10980,7 @@
}
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";
@@ -11005,7 +10990,7 @@
" 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";
@@ -11015,12 +11000,12 @@
" 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[] =
@@ -11032,7 +11017,7 @@
" 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";
@@ -11047,7 +11032,7 @@
" 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[] =
@@ -11060,11 +11045,11 @@
" 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[] =
@@ -11074,18 +11059,19 @@
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) */
@@ -16799,6 +16785,11 @@
/*! \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)
@@ -16822,92 +16813,42 @@
return sip_reload(0, 0, NULL);
}
-static struct ast_cli_entry cli_sip_no_history_deprecated = {
- { "sip", "no", "history", NULL },
- sip_no_history_deprecated, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_no_debug_deprecated = {
- { "sip", "no", "debug", NULL },
- sip_no_debug_deprecated, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_objects_deprecated = {
- { "sip", "show", "objects", NULL },
- sip_show_objects, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_users_deprecated = {
- { "sip", "show", "users", NULL },
- sip_show_users, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_subscriptions_deprecated = {
- { "sip", "show", "subscriptions", NULL },
- sip_show_subscriptions, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_channels_deprecated = {
- { "sip", "show", "channels", NULL },
- sip_show_channels, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_domains_deprecated = {
- { "sip", "show", "domains", NULL },
- sip_show_domains, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_peers_deprecated = {
- { "sip", "show", "peers", NULL },
- sip_show_peers, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_inuse_deprecated = {
- { "sip", "show", "inuse", NULL },
- sip_show_inuse, NULL,
- NULL };
-
-static struct ast_cli_entry cli_sip_show_registry_deprecated = {
- { "sip", "show", "registry", NULL },
- sip_show_registry, NULL,
- NULL };
-
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, NULL, &cli_sip_show_channels_deprecated },
-
- { { "sip", "list", "domains", NULL },
+ show_channels_usage },
+
+ { { "sip", "show", "domains", NULL },
sip_show_domains, "List our local SIP domains.",
- show_domains_usage, NULL, &cli_sip_show_domains_deprecated },
-
- { { "sip", "list", "inuse", NULL },
+ show_domains_usage },
+
+ { { "sip", "show", "inuse", NULL },
sip_show_inuse, "List all inuse/limits",
- show_inuse_usage, NULL, &cli_sip_show_inuse_deprecated },
-
- { { "sip", "list", "objects", NULL },
+ show_inuse_usage },
+
+ { { "sip", "show", "objects", NULL },
sip_show_objects, "List all SIP object allocations",
- show_objects_usage, NULL, &cli_sip_show_objects_deprecated },
-
- { { "sip", "list", "peers", NULL },
+ show_objects_usage },
+
+ { { "sip", "show", "peers", NULL },
sip_show_peers, "List defined SIP peers",
- show_peers_usage, NULL, &cli_sip_show_peers_deprecated },
-
- { { "sip", "list", "registry", NULL },
+ show_peers_usage },
+
+ { { "sip", "show", "registry", NULL },
sip_show_registry, "List SIP registration status",
- show_reg_usage, NULL, &cli_sip_show_registry_deprecated },
+ show_reg_usage },
{ { "sip", "show", "settings", NULL },
sip_show_settings, "Show SIP global settings",
- show_settings_usage, NULL, NULL},
-
- { { "sip", "list", "subscriptions", NULL },
+ show_settings_usage },
+
+ { { "sip", "show", "subscriptions", NULL },
sip_show_subscriptions, "List active SIP subscriptions",
- show_subscriptions_usage, NULL, &cli_sip_show_subscriptions_deprecated },
-
- { { "sip", "list", "users", NULL },
+ show_subscriptions_usage },
+
+ { { "sip", "show", "users", NULL },
sip_show_users, "List defined SIP users",
- show_users_usage, NULL, &cli_sip_show_users_deprecated },
+ show_users_usage },
{ { "sip", "notify", NULL },
sip_notify, "Send a notify packet to a SIP peer",
@@ -16953,17 +16894,17 @@
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, NULL, &cli_sip_no_debug_deprecated },
+ no_debug_usage },
{ { "sip", "history", NULL },
sip_do_history, "Enable SIP history",
history_usage },
- { { "sip", "nohistory", NULL },
+ { { "sip", "history", "off", NULL },
sip_no_history, "Disable SIP history",
- no_history_usage, NULL, &cli_sip_no_history_deprecated },
+ no_history_usage },
{ { "sip", "reload", NULL },
sip_reload, "Reload SIP configuration",
Modified: team/oej/iaxtrunkfix-1.4/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/channels/chan_skinny.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/channels/chan_skinny.c (original)
+++ team/oej/iaxtrunkfix-1.4/channels/chan_skinny.c Sat Nov 4 10:31:16 2006
@@ -1758,19 +1758,9 @@
return RESULT_SUCCESS;
}
-static int skinny_no_debug_deprecated(int fd, int argc, char *argv[])
+static int skinny_no_debug(int fd, int argc, char *argv[])
{
if (argc != 3) {
- return RESULT_SHOWUSAGE;
- }
- skinnydebug = 0;
- ast_cli(fd, "Skinny Debugging Disabled\n");
- return RESULT_SUCCESS;
-}
-
-static int skinny_no_debug(int fd, int argc, char *argv[])
-{
- if (argc != 2) {
return RESULT_SHOWUSAGE;
}
skinnydebug = 0;
@@ -1959,11 +1949,11 @@
}
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[] =
@@ -1971,44 +1961,29 @@
" 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[] =
"Usage: skinny reset <DeviceId|all> [restart]\n"
" Causes a Skinny device to reset itself, optionally with a full restart\n";
-static struct ast_cli_entry cli_skinny_show_devices_deprecated = {
- { "skinny", "show", "devices", NULL },
- skinny_show_devices, NULL,
- NULL };
-
-static struct ast_cli_entry cli_skinny_show_lines_deprecated = {
- { "skinny", "show", "lines", NULL },
- skinny_show_lines, NULL,
- NULL };
-
-static struct ast_cli_entry cli_skinny_no_debug_deprecated = {
- { "skinny", "no", "debug", NULL },
- skinny_no_debug_deprecated, NULL,
- NULL };
-
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, NULL, &cli_skinny_show_devices_deprecated },
-
- { { "skinny", "list", "lines", NULL },
+ show_devices_usage },
+
+ { { "skinny", "show", "lines", NULL },
skinny_show_lines, "List defined Skinny lines per device",
- show_lines_usage, NULL, &cli_skinny_show_lines_deprecated },
+ show_lines_usage },
{ { "skinny", "debug", NULL },
skinny_do_debug, "Enable Skinny debugging",
debug_usage },
- { { "skinny", "nodebug", NULL },
+ { { "skinny", "debug", "off", NULL },
skinny_no_debug, "Disable Skinny debugging",
- no_debug_usage, NULL, &cli_skinny_no_debug_deprecated },
+ no_debug_usage },
{ { "skinny", "reset", NULL },
skinny_reset_device, "Reset Skinny device(s)",
Modified: team/oej/iaxtrunkfix-1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/configure.ac?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/configure.ac (original)
+++ team/oej/iaxtrunkfix-1.4/configure.ac Sat Nov 4 10:31:16 2006
@@ -25,6 +25,8 @@
case "${host_os}" in
freebsd*)
ac_default_prefix=/usr/local
+ CPPFLAGS=-I/usr/local/include
+ LDFLAGS=-L/usr/local/lib
;;
*)
ac_default_prefix=/usr
Modified: team/oej/iaxtrunkfix-1.4/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/iaxtrunkfix-1.4/main/asterisk.c?rev=47191&r1=47190&r2=47191&view=diff
==============================================================================
--- team/oej/iaxtrunkfix-1.4/main/asterisk.c (original)
+++ team/oej/iaxtrunkfix-1.4/main/asterisk.c Sat Nov 4 10:31:16 2006
@@ -139,10 +139,10 @@
#define WELCOME_MESSAGE \
ast_verbose("Asterisk " ASTERISK_VERSION ", Copyright (C) 1999 - 2006 Digium, Inc. and others.\n"); \
ast_verbose("Created by Mark Spencer <markster at digium.com>\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
@@ -291,7 +291,7 @@
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)
@@ -531,7 +531,7 @@
}
static char show_version_files_help[] =
-"Usage: file list version [like <pattern>]\n"
+"Usage: core show file version [like <pattern>]\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";
@@ -1359,15 +1359,15 @@
" 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[])
[... 1113 lines stripped ...]
More information about the svn-commits
mailing list