[svn-commits] branch russell/autoconf_and_menuselect - r8196 in
/team/russell/autoconf_and_...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Jan 18 14:38:52 MST 2006
Author: russell
Date: Wed Jan 18 15:38:47 2006
New Revision: 8196
URL: http://svn.digium.com/view/asterisk?rev=8196&view=rev
Log:
Merged revisions 8087-8090,8099-8105,8113-8114,8118,8120,8123,8125,8127,8133,8135-8138,8141,8148,8150,8152-8153,8155-8157,8161,8163,8179,8186,8190,8195 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r8087 | russell | 2006-01-15 20:32:46 -0500 (Sun, 15 Jan 2006) | 2 lines
block appropriate revisions from being merged from 1.2 ...
................
r8088 | russell | 2006-01-15 20:36:10 -0500 (Sun, 15 Jan 2006) | 1 line
................
r8089 | russell | 2006-01-15 20:46:15 -0500 (Sun, 15 Jan 2006) | 8 lines
block more revisions ...
TO ALL DEVELOPERS WITH COMMIT ACCESS:
Please remember to *always* do an 'svnmerge block -r <rev#>' on the trunk
every single time you make a commit to the 1.2 branch which will not be pulled
into the trunk using svnmerge. This is important for us to be able to take
full advatage of this tool.
................
r8090 | russell | 2006-01-15 20:47:02 -0500 (Sun, 15 Jan 2006) | 10 lines
Merged revisions 7963 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7963 | mogorman | 2006-01-10 23:38:07 -0500 (Tue, 10 Jan 2006) | 2 lines
Minor typo refrenced in 6191
........
................
r8099 | bweschke | 2006-01-16 12:31:30 -0500 (Mon, 16 Jan 2006) | 3 lines
More code optimization with the new argument macros #6253
................
r8100 | bweschke | 2006-01-16 12:37:44 -0500 (Mon, 16 Jan 2006) | 3 lines
Spelling corrections (mostly in comments and doxygen areas) #6249
................
r8101 | russell | 2006-01-16 12:51:35 -0500 (Mon, 16 Jan 2006) | 2 lines
remove redundant CFLAGS for BSD which are already set in the main Makefile (issue #6250)
................
r8102 | tilghman | 2006-01-16 13:05:19 -0500 (Mon, 16 Jan 2006) | 2 lines
Bug 5090 - sample configuration for udptl packets
................
r8103 | tilghman | 2006-01-16 13:39:01 -0500 (Mon, 16 Jan 2006) | 2 lines
Change a debugging message committed with the wrong level
................
r8104 | tilghman | 2006-01-16 13:41:18 -0500 (Mon, 16 Jan 2006) | 2 lines
Argh, another ERROR that should have been DEBUG
................
r8105 | jdixon | 2006-01-16 13:52:13 -0500 (Mon, 16 Jan 2006) | 3 lines
Added NOANSWER support, so that optional the DISA application starts without
answering (used in new version of app_rpt, and potentially other applicaitons).
................
r8113 | kpfleming | 2006-01-16 18:52:02 -0500 (Mon, 16 Jan 2006) | 2 lines
block this revision, fix is different in this branch
................
r8114 | kpfleming | 2006-01-16 18:52:51 -0500 (Mon, 16 Jan 2006) | 2 lines
check rlimit _after_ reading config file, so that if 'dumpcore' is specified there it will take effect
................
r8118 | oej | 2006-01-16 22:05:43 -0500 (Mon, 16 Jan 2006) | 2 lines
Doxygen update
................
r8120 | kpfleming | 2006-01-17 00:15:33 -0500 (Tue, 17 Jan 2006) | 2 lines
don't generate any message for native bridge attempts unless all the basic checks have passed and we're actually going to try it
................
r8123 | kpfleming | 2006-01-17 08:13:31 -0500 (Tue, 17 Jan 2006) | 10 lines
Merged revisions 8122 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8122 | kpfleming | 2006-01-17 07:11:55 -0600 (Tue, 17 Jan 2006) | 2 lines
update CLI copyright notice
........
................
r8125 | mogorman | 2006-01-17 11:58:09 -0500 (Tue, 17 Jan 2006) | 10 lines
Merged revisions 7963 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r7963 | mogorman | 2006-01-10 22:38:07 -0600 (Tue, 10 Jan 2006) | 2 lines
Minor typo refrenced in 6191
........
................
r8127 | mogorman | 2006-01-17 12:25:53 -0500 (Tue, 17 Jan 2006) | 2 lines
Added tab completion for help. bug 6074
................
r8133 | mattf | 2006-01-17 13:20:33 -0500 (Tue, 17 Jan 2006) | 2 lines
Check to see if arg is NULL before passing (#6094)
................
r8135 | bweschke | 2006-01-17 13:31:03 -0500 (Tue, 17 Jan 2006) | 3 lines
Fix compiler warning.
................
r8136 | oej | 2006-01-17 13:54:56 -0500 (Tue, 17 Jan 2006) | 3 lines
- Logging clean up
- Whitespace removed and added, formatting fixed
................
r8137 | oej | 2006-01-17 13:56:57 -0500 (Tue, 17 Jan 2006) | 2 lines
Extra comma causing compilation errors...
................
r8138 | oej | 2006-01-17 14:03:04 -0500 (Tue, 17 Jan 2006) | 2 lines
Portability - compilation warning on Mac OS/X removed
................
r8141 | mogorman | 2006-01-17 15:16:18 -0500 (Tue, 17 Jan 2006) | 11 lines
Merged revisions 8140 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r8140 | mogorman | 2006-01-17 14:10:29 -0600 (Tue, 17 Jan 2006) | 3 lines
Stop any generators running on a channel when
festival is called as described in 5996
........
................
r8148 | kpfleming | 2006-01-17 15:49:39 -0500 (Tue, 17 Jan 2006) | 2 lines
suppress compiler warning
................
r8150 | kpfleming | 2006-01-17 15:53:04 -0500 (Tue, 17 Jan 2006) | 2 lines
spelling fix
................
r8152 | mogorman | 2006-01-17 15:58:56 -0500 (Tue, 17 Jan 2006) | 3 lines
allow for multiple periodic announcements
from bug 5273 with minor changes.
................
r8153 | mogorman | 2006-01-17 16:10:38 -0500 (Tue, 17 Jan 2006) | 2 lines
oops all better now.
................
r8155 | mattf | 2006-01-17 18:13:42 -0500 (Tue, 17 Jan 2006) | 2 lines
Fix answeronpolarityswitch and hanguponpolarityswitch when both are yes (#6229)
................
r8156 | mattf | 2006-01-17 18:37:22 -0500 (Tue, 17 Jan 2006) | 2 lines
Improvements to DSP callprogress=yes code (#5009)
................
r8157 | kpfleming | 2006-01-17 18:45:05 -0500 (Tue, 17 Jan 2006) | 2 lines
remove some more deprecated (pre-1.2) stuff
................
r8161 | mogorman | 2006-01-17 19:05:09 -0500 (Tue, 17 Jan 2006) | 3 lines
cleanup the show uptime code, and minor changes
to patch 6274
................
r8163 | mogorman | 2006-01-17 19:49:43 -0500 (Tue, 17 Jan 2006) | 12 lines
Merged revisions 8162 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8162 | mogorman | 2006-01-17 18:47:04 -0600 (Tue, 17 Jan 2006) | 4 lines
Changed order of autoload so that pbx_ comes before
channels, and in doing so cause bug 6002 to not
be an issue
........
................
r8179 | mogorman | 2006-01-17 22:53:10 -0500 (Tue, 17 Jan 2006) | 3 lines
cli.h cleanup and additional documentation
from patch 6272
................
r8186 | mogorman | 2006-01-18 10:42:48 -0500 (Wed, 18 Jan 2006) | 3 lines
allows for use of the originate function from
the cli patch 5847
................
r8190 | mogorman | 2006-01-18 11:24:29 -0500 (Wed, 18 Jan 2006) | 2 lines
oops. sorry
................
r8195 | mogorman | 2006-01-18 16:12:14 -0500 (Wed, 18 Jan 2006) | 11 lines
Merged revisions 8194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8194 | mogorman | 2006-01-18 15:02:06 -0600 (Wed, 18 Jan 2006) | 3 lines
Solves issue with the login proccess in meetme
patch from 6136
........
................
Added:
team/russell/autoconf_and_menuselect/configs/udptl.conf.sample
- copied unchanged from r8195, trunk/configs/udptl.conf.sample
team/russell/autoconf_and_menuselect/res/res_clioriginate.c
- copied unchanged from r8195, trunk/res/res_clioriginate.c
Modified:
team/russell/autoconf_and_menuselect/ (props changed)
team/russell/autoconf_and_menuselect/apps/app_meetme.c
team/russell/autoconf_and_menuselect/codecs/Makefile
team/russell/autoconf_and_menuselect/formats/Makefile
team/russell/autoconf_and_menuselect/include/asterisk/cli.h
team/russell/autoconf_and_menuselect/include/asterisk/module.h
team/russell/autoconf_and_menuselect/res/Makefile
team/russell/autoconf_and_menuselect/res/res_features.c
team/russell/autoconf_and_menuselect/utils/Makefile
Propchange: team/russell/autoconf_and_menuselect/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Wed Jan 18 15:38:47 2006
@@ -1,1 +1,1 @@
-/branches/1.2:7497,7915,7960,7965,7970,7976
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112
Propchange: team/russell/autoconf_and_menuselect/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 18 15:38:47 2006
@@ -1,1 +1,1 @@
-/trunk:1-8085
+/trunk:1-8195
Modified: team/russell/autoconf_and_menuselect/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/apps/app_meetme.c?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/apps/app_meetme.c (original)
+++ team/russell/autoconf_and_menuselect/apps/app_meetme.c Wed Jan 18 15:38:47 2006
@@ -1759,7 +1759,8 @@
if (dynamic_pin) {
if (dynamic_pin[0] == 'q') {
/* Query the user to enter a PIN */
- ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0);
+ if (ast_app_getdata(chan, "conf-getpin", dynamic_pin, AST_MAX_EXTENSION - 1, 0) < 0)
+ return NULL;
}
cnf = build_conf(confno, dynamic_pin, "", make, dynamic);
} else {
Modified: team/russell/autoconf_and_menuselect/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/codecs/Makefile?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/codecs/Makefile (original)
+++ team/russell/autoconf_and_menuselect/codecs/Makefile Wed Jan 18 15:38:47 2006
@@ -74,10 +74,6 @@
LIBLPC10=lpc10/liblpc10.a
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-endif
-
CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
codec_g726.so
Modified: team/russell/autoconf_and_menuselect/formats/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/formats/Makefile?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/formats/Makefile (original)
+++ team/russell/autoconf_and_menuselect/formats/Makefile Wed Jan 18 15:38:47 2006
@@ -28,10 +28,6 @@
#
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
FORMAT_LIBS+=format_ogg_vorbis.so
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
GSMLIB=../codecs/gsm/lib/libgsm.a
Modified: team/russell/autoconf_and_menuselect/include/asterisk/cli.h
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/include/asterisk/cli.h?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/include/asterisk/cli.h (original)
+++ team/russell/autoconf_and_menuselect/include/asterisk/cli.h Wed Jan 18 15:38:47 2006
@@ -29,7 +29,7 @@
#include <stdarg.h>
-extern void ast_cli(int fd, char *fmt, ...)
+void ast_cli(int fd, char *fmt, ...)
__attribute__ ((format (printf, 2, 3)));
#define RESULT_SUCCESS 0
@@ -45,40 +45,55 @@
/*! \brief A command line entry */
struct ast_cli_entry {
/*! Null terminated list of the words of the command */
- char *cmda[AST_MAX_CMD_LEN];
- /*! Handler for the command (fd for output, # of arguments, argument list). Returns RESULT_SHOWUSAGE for improper arguments */
+ char * cmda[AST_MAX_CMD_LEN];
+ /*! Handler for the command (fd for output, # of args, argument list).
+ Returns RESULT_SHOWUSAGE for improper arguments.
+ argv[] has argc 'useful' entries, and an additional NULL entry
+ at the end so that clients requiring NULL terminated arrays
+ can use it without need for copies.
+ You can overwrite argv or the strings it points to, but remember
+ that this memory is deallocated after the handler returns.
+ */
int (*handler)(int fd, int argc, char *argv[]);
/*! Summary of the command (< 60 characters) */
- char *summary;
+ const char *summary;
/*! Detailed usage information */
- char *usage;
- /*! Generate a list of possible completions for a given word */
- char *(*generator)(char *line, char *word, int pos, int state);
+ const char *usage;
+ /*! Generate the n-th (starting from 0) possible completion
+ for a given 'word' following 'line' in position 'pos'.
+ 'line' and 'word' must not be modified.
+ Must return a malloc'ed string with the n-th value when available,
+ or NULL if the n-th completion does not exist.
+ Typically, the function is called with increasing values for n
+ until a NULL is returned.
+ */
+ char *(*generator)(char *line, char *word, int pos, int n);
/*! For linking */
struct ast_cli_entry *next;
/*! For keeping track of usage */
int inuse;
};
+
/*! \brief Interprets a command
* Interpret a command s, sending output to fd
* Returns 0 on succes, -1 on failure
*/
-extern int ast_cli_command(int fd, char *s);
+int ast_cli_command(int fd, char *s);
/*! \brief Registers a command or an array of commands
* \param e which cli entry to register
* Register your own command
* Returns 0 on success, -1 on failure
*/
-extern int ast_cli_register(struct ast_cli_entry *e);
+int ast_cli_register(struct ast_cli_entry *e);
/*!
* \brief Register multiple commands
* \param e pointer to first cli entry to register
* \param len number of entries to register
*/
-extern void ast_cli_register_multiple(struct ast_cli_entry *e, int len);
+void ast_cli_register_multiple(struct ast_cli_entry *e, int len);
/*! \brief Unregisters a command or an array of commands
*
@@ -86,23 +101,36 @@
* Unregister your own command. You must pass a completed ast_cli_entry structure
* Returns 0.
*/
-extern int ast_cli_unregister(struct ast_cli_entry *e);
+int ast_cli_unregister(struct ast_cli_entry *e);
/*!
* \brief Unregister multiple commands
* \param e pointer to first cli entry to unregister
* \param len number of entries to unregister
*/
-extern void ast_cli_unregister_multiple(struct ast_cli_entry *e, int len);
+void ast_cli_unregister_multiple(struct ast_cli_entry *e, int len);
/*! \brief Readline madness
* Useful for readline, that's about it
* Returns 0 on success, -1 on failure
*/
-extern char *ast_cli_generator(char *, char *, int);
+char *ast_cli_generator(char *, char *, int);
-extern int ast_cli_generatornummatches(char *, char *);
-extern char **ast_cli_completion_matches(char *, char *);
+int ast_cli_generatornummatches(char *, char *);
+
+/*!
+ * \brief Generates a NULL-terminated array of strings that
+ * 1) begin with the string in the second parameter, and
+ * 2) are valid in a command after the string in the first parameter.
+ *
+ * The first entry (offset 0) of the result is the longest common substring
+ * in the results, useful to extend the string that has been completed.
+ * Subsequent entries are all possible values, followe by a NULL.
+ * All strings and the array itself are malloc'ed and must be freed
+ * by the caller.
+ */
+char **ast_cli_completion_matches(char *, char *);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
Modified: team/russell/autoconf_and_menuselect/include/asterisk/module.h
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/include/asterisk/module.h?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/include/asterisk/module.h (original)
+++ team/russell/autoconf_and_menuselect/include/asterisk/module.h Wed Jan 18 15:38:47 2006
@@ -289,6 +289,10 @@
#define LOCAL_USER_DECL AST_MUTEX_DEFINE_STATIC(localuser_lock); \
static struct localuser *localusers = NULL; \
static int localusecnt = 0;
+
+#define STANDARD_USECOUNT_DECL \
+ AST_MUTEX_DEFINE_STATIC(localuser_lock); \
+ static int localusecnt = 0;
#define STANDARD_INCREMENT_USECOUNT \
ast_mutex_lock(&localuser_lock); \
Modified: team/russell/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/res/Makefile?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/res/Makefile (original)
+++ team/russell/autoconf_and_menuselect/res/Makefile Wed Jan 18 15:38:47 2006
@@ -12,7 +12,7 @@
#
ifeq ($(RES_MODULES),)
-RES_MODULES=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so
+RES_MODULES=res_indications.so res_monitor.so res_adsi.so res_agi.so res_features.so res_clioriginate.so
endif
ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),)
Modified: team/russell/autoconf_and_menuselect/res/res_features.c
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/res/res_features.c?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/res/res_features.c (original)
+++ team/russell/autoconf_and_menuselect/res/res_features.c Wed Jan 18 15:38:47 2006
@@ -1272,7 +1272,7 @@
src = chan;
else if ((monitor_exec = pbx_builtin_getvar_helper(peer, "AUTO_MONITOR")))
src = peer;
- if (src) {
+ if (monitor_app && src) {
char *tmp = ast_strdupa(monitor_exec);
if (tmp) {
pbx_exec(src, monitor_app, tmp, 1);
@@ -1998,11 +1998,6 @@
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
cfg = ast_config_load("features.conf");
- if (!cfg) {
- cfg = ast_config_load("parking.conf");
- if (cfg)
- ast_log(LOG_NOTICE, "parking.conf is deprecated in favor of 'features.conf'. Please rename it.\n");
- }
if (cfg) {
var = ast_variable_browse(cfg, "general");
while(var) {
Modified: team/russell/autoconf_and_menuselect/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/autoconf_and_menuselect/utils/Makefile?rev=8196&r1=8195&r2=8196&view=diff
==============================================================================
--- team/russell/autoconf_and_menuselect/utils/Makefile (original)
+++ team/russell/autoconf_and_menuselect/utils/Makefile Wed Jan 18 15:38:47 2006
@@ -15,10 +15,6 @@
# Don't use ast mm routines
#
CFLAGS+=-DNO_AST_MM
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_UTILS)/usr/local/include -L$(CROSS_COMPILE_UTILS)/usr/local/lib
-endif
ifeq ($(UTILS),)
More information about the svn-commits
mailing list