[asterisk-commits] pcadach: branch pcadach/chan_h323-live r40834 -
in /team/pcadach/chan_h323-li...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Aug 22 06:23:59 MST 2006
Author: pcadach
Date: Tue Aug 22 08:23:58 2006
New Revision: 40834
URL: http://svn.digium.com/view/asterisk?rev=40834&view=rev
Log:
Merged revisions 40789-40792,40796,40799,40812,40815,40818-40820,40826,40832-40833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r40789 | kpfleming | 2006-08-22 02:04:59 +0600 (Втр, 22 Авг 2006) | 2 lines
don't initialize global variables list twice
................
r40790 | kpfleming | 2006-08-22 02:12:18 +0600 (Втр, 22 Авг 2006) | 3 lines
use a customized configure macro to tell the script that uCLinux does not have fork() that works
drop all startup options and code related to forking if it is not available
................
r40791 | kpfleming | 2006-08-22 02:18:36 +0600 (Втр, 22 Авг 2006) | 2 lines
another variable to clear out before configuring mxml
................
r40792 | kpfleming | 2006-08-22 02:19:47 +0600 (Втр, 22 Авг 2006) | 2 lines
oops... missed one
................
r40796 | kpfleming | 2006-08-22 04:23:26 +0600 (Втр, 22 Авг 2006) | 2 lines
restore 'preload' functionality in loader
................
r40799 | mogorman | 2006-08-22 04:36:15 +0600 (Втр, 22 Авг 2006) | 12 lines
Merged revisions 40798 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r40798 | mogorman | 2006-08-21 17:34:26 -0500 (Mon, 21 Aug 2006) | 4 lines
Move the load_modules call so that if a module needs
realtime support it will work, none do currently but a good
move none the less.
........
................
r40812 | file | 2006-08-22 07:01:39 +0600 (Втр, 22 Авг 2006) | 2 lines
Fix up the props a bit
................
r40815 | file | 2006-08-22 07:57:40 +0600 (Втр, 22 Авг 2006) | 2 lines
Sorry, but this does not resemble malloc... so GCC was ignoring the attribute and throwing a warning.
................
r40818 | file | 2006-08-22 08:15:34 +0600 (Втр, 22 Авг 2006) | 2 lines
Make doxygen work with the new location of files that now reside in main
................
r40819 | file | 2006-08-22 08:24:46 +0600 (Втр, 22 Авг 2006) | 2 lines
Make a warning about an unused function & variable go away on the stand alone AEL build.
................
r40820 | file | 2006-08-22 08:30:38 +0600 (Втр, 22 Авг 2006) | 2 lines
Another compile time warning bites the dust
................
r40826 | tilghman | 2006-08-22 09:01:49 +0600 (Втр, 22 Авг 2006) | 9 lines
Blocked revisions 40821 via svnmerge
........
r40821 | tilghman | 2006-08-21 21:59:37 -0500 (Mon, 21 Aug 2006) | 2 lines
Bug 7779 - Using initstate(3) means that we cannot unload this module once loaded.
........
................
r40832 | qwell | 2006-08-22 11:24:50 +0600 (Втр, 22 Авг 2006) | 2 lines
a couple Solaris tweaks, to help build properly.
................
r40833 | qwell | 2006-08-22 11:34:44 +0600 (Втр, 22 Авг 2006) | 4 lines
Solaris didn't like this.
Let's just go ahead and make this match every other uintXX_t in Asterisk.
................
Modified:
team/pcadach/chan_h323-live/ (props changed)
team/pcadach/chan_h323-live/Makefile
team/pcadach/chan_h323-live/acinclude.m4
team/pcadach/chan_h323-live/agi/Makefile
team/pcadach/chan_h323-live/build_tools/make_version
team/pcadach/chan_h323-live/configure
team/pcadach/chan_h323-live/configure.ac
team/pcadach/chan_h323-live/contrib/asterisk-ng-doxygen
team/pcadach/chan_h323-live/include/asterisk.h
team/pcadach/chan_h323-live/include/asterisk/utils.h
team/pcadach/chan_h323-live/main/asterisk.c
team/pcadach/chan_h323-live/main/db1-ast/Makefile
team/pcadach/chan_h323-live/main/editline/Makefile.in
team/pcadach/chan_h323-live/main/loader.c
team/pcadach/chan_h323-live/main/pbx.c
team/pcadach/chan_h323-live/pbx/pbx_ael.c
team/pcadach/chan_h323-live/utils/ (props changed)
team/pcadach/chan_h323-live/utils/muted.c
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
automerge = *
Propchange: team/pcadach/chan_h323-live/
('automerge-email' removed)
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 22 08:23:58 2006
@@ -1,1 +1,1 @@
-/trunk:1-40787
+/trunk:1-40833
Modified: team/pcadach/chan_h323-live/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/Makefile?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/Makefile (original)
+++ team/pcadach/chan_h323-live/Makefile Tue Aug 22 08:23:58 2006
@@ -177,7 +177,7 @@
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+ ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
endif
ASTERISKVERSION:=$(shell build_tools/make_version .)
@@ -650,7 +650,7 @@
@CFLAGS="-include $(ASTTOPDIR)/include/asterisk/autoconfig.h -I$(ASTTOPDIR)/include" PARENTSRC="$(ASTTOPDIR)" $(MAKE) -C menuselect CC="$(HOST_CC)" menuselect
mxml/libmxml.a:
- @cd mxml && unset CFLAGS AST_LIBS && test -f config.h || ./configure --build=$(BUILD_PLATFORM) --host=$(BUILD_PLATFORM)
+ @cd mxml && unset CC CFLAGS LDFLAGS && test -f config.h || ./configure --build=$(BUILD_PLATFORM) --host=$(BUILD_PLATFORM)
$(MAKE) -C mxml libmxml.a
menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
Modified: team/pcadach/chan_h323-live/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/acinclude.m4?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/acinclude.m4 (original)
+++ team/pcadach/chan_h323-live/acinclude.m4 Tue Aug 22 08:23:58 2006
@@ -427,3 +427,64 @@
AC_SUBST([OPENH323_BUILD])
fi
])
+
+
+# AST_FUNC_FORK
+# -------------
+AN_FUNCTION([fork], [AST_FUNC_FORK])
+AN_FUNCTION([vfork], [AST_FUNC_FORK])
+AC_DEFUN([AST_FUNC_FORK],
+[AC_REQUIRE([AC_TYPE_PID_T])dnl
+AC_CHECK_HEADERS(vfork.h)
+AC_CHECK_FUNCS(fork vfork)
+if test "x$ac_cv_func_fork" = xyes; then
+ _AST_FUNC_FORK
+else
+ ac_cv_func_fork_works=$ac_cv_func_fork
+fi
+if test "x$ac_cv_func_fork_works" = xcross; then
+ case $host in
+ *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* )
+ # Override, as these systems have only a dummy fork() stub
+ ac_cv_func_fork_works=no
+ ;;
+ *)
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+ AC_MSG_WARN([result $ac_cv_func_fork_works guessed because of cross compilation])
+fi
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+if test "x$ac_cv_func_vfork" = xyes; then
+ _AC_FUNC_VFORK
+fi;
+if test "x$ac_cv_func_fork_works" = xcross; then
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ AC_MSG_WARN([result $ac_cv_func_vfork_works guessed because of cross compilation])
+fi
+
+if test "x$ac_cv_func_vfork_works" = xyes; then
+ AC_DEFINE(HAVE_WORKING_VFORK, 1, [Define to 1 if `vfork' works.])
+else
+ AC_DEFINE(vfork, fork, [Define as `fork' if `vfork' does not work.])
+fi
+if test "x$ac_cv_func_fork_works" = xyes; then
+ AC_DEFINE(HAVE_WORKING_FORK, 1, [Define to 1 if `fork' works.])
+fi
+])# AST_FUNC_FORK
+
+
+# _AST_FUNC_FORK
+# -------------
+AC_DEFUN([_AST_FUNC_FORK],
+ [AC_CACHE_CHECK(for working fork, ac_cv_func_fork_works,
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],
+ [
+ /* By Ruediger Kuhlmann. */
+ return fork () < 0;
+ ])],
+ [ac_cv_func_fork_works=yes],
+ [ac_cv_func_fork_works=no],
+ [ac_cv_func_fork_works=cross])])]
+)# _AST_FUNC_FORK
Modified: team/pcadach/chan_h323-live/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/agi/Makefile?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/agi/Makefile (original)
+++ team/pcadach/chan_h323-live/agi/Makefile Tue Aug 22 08:23:58 2006
@@ -16,7 +16,7 @@
AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
ifeq ($(OSARCH),SunOS)
- LIBS+=-lsocket -lnsl ../strcompat.o
+ LIBS+=-lsocket -lnsl ../main/strcompat.o
endif
include $(ASTTOPDIR)/Makefile.rules
Modified: team/pcadach/chan_h323-live/build_tools/make_version
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/build_tools/make_version?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/build_tools/make_version (original)
+++ team/pcadach/chan_h323-live/build_tools/make_version Tue Aug 22 08:23:58 2006
@@ -5,7 +5,7 @@
elif [ -f ${1}/.svnrevision ]; then
echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision`
elif [ -d .svn ]; then
- PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
+ PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0
TEAM=0
Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Tue Aug 22 08:23:58 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40391 .
+# From configure.ac Revision: 40756 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
@@ -8216,8 +8216,7 @@
fi
-
-for ac_header in unistd.h vfork.h
+for ac_header in vfork.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -8477,18 +8476,22 @@
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
-/* By Ruediger Kuhlmann. */
- #include <sys/types.h>
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- /* Some systems only have a dummy stub for fork() */
- int main ()
- {
- if (fork() < 0)
- exit (1);
- exit (0);
- }
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+ /* By Ruediger Kuhlmann. */
+ return fork () < 0;
+
+ ;
+ return 0;
+}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8521,7 +8524,7 @@
fi
if test "x$ac_cv_func_fork_works" = xcross; then
case $host in
- *-*-amigaos* | *-*-msdosdjgpp*)
+ *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* )
# Override, as these systems have only a dummy fork() stub
ac_cv_func_fork_works=no
;;
Modified: team/pcadach/chan_h323-live/configure.ac
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure.ac?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure.ac (original)
+++ team/pcadach/chan_h323-live/configure.ac Tue Aug 22 08:23:58 2006
@@ -199,7 +199,7 @@
AC_FUNC_CHOWN
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_ERROR_AT_LINE
-AC_FUNC_FORK
+AST_FUNC_FORK
AC_FUNC_FSEEKO
AC_PROG_GCC_TRADITIONAL
# XXX: these are commented out until we determine whether it matters if our malloc()
Modified: team/pcadach/chan_h323-live/contrib/asterisk-ng-doxygen
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/contrib/asterisk-ng-doxygen?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/contrib/asterisk-ng-doxygen (original)
+++ team/pcadach/chan_h323-live/contrib/asterisk-ng-doxygen Tue Aug 22 08:23:58 2006
@@ -446,11 +446,12 @@
# with spaces.
INPUT = ./ \
+ main \
include \
include/asterisk \
channels \
funcs \
- stdtime \
+ main/stdtime \
apps \
cdr \
codecs \
Modified: team/pcadach/chan_h323-live/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/include/asterisk.h?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/include/asterisk.h (original)
+++ team/pcadach/chan_h323-live/include/asterisk.h Tue Aug 22 08:23:58 2006
@@ -51,7 +51,7 @@
extern char ast_config_AST_SYSTEM_NAME[20];
int ast_set_priority(int); /*!< Provided by asterisk.c */
-int load_modules(void); /*!< Provided by loader.c */
+int load_modules(unsigned int); /*!< Provided by loader.c */
int load_pbx(void); /*!< Provided by pbx.c */
int init_logger(void); /*!< Provided by logger.c */
void close_logger(void); /*!< Provided by logger.c */
Modified: team/pcadach/chan_h323-live/include/asterisk/utils.h
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/include/asterisk/utils.h?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/include/asterisk/utils.h (original)
+++ team/pcadach/chan_h323-live/include/asterisk/utils.h Tue Aug 22 08:23:58 2006
@@ -433,7 +433,7 @@
_ast_asprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, fmt, __VA_ARGS__)
AST_INLINE_API(
-int attribute_malloc _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
+int _ast_asprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, ...),
{
int res;
va_list ap;
@@ -459,7 +459,7 @@
_ast_vasprintf((ret), __FILE__, __LINE__, __PRETTY_FUNCTION__, (fmt), (ap))
AST_INLINE_API(
-int attribute_malloc _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
+int _ast_vasprintf(char **ret, const char *file, int lineno, const char *func, const char *fmt, va_list ap),
{
int res;
Modified: team/pcadach/chan_h323-live/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/asterisk.c?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/asterisk.c (original)
+++ team/pcadach/chan_h323-live/main/asterisk.c Tue Aug 22 08:23:58 2006
@@ -405,7 +405,7 @@
#if defined(__FreeBSD__)
#include <machine/cpufunc.h>
#elif defined(linux)
-static __inline u_int64_t
+static __inline uint64_t
rdtsc(void)
{
uint64_t rv;
@@ -415,7 +415,7 @@
}
#endif
#else /* supply a dummy function on other platforms */
-static __inline u_int64_t
+static __inline uint64_t
rdtsc(void)
{
return 0;
@@ -647,7 +647,8 @@
struct rusage rusage;
int status;
- ast_replace_sigchld();
+#if HAVE_WORKING_FORK
+ ast_replace_sigchld();
pid = fork();
@@ -674,6 +675,9 @@
}
ast_unreplace_sigchld();
+#else
+ res = -1;
+#endif
return res;
}
@@ -2101,7 +2105,10 @@
printf(" -U <user> Run as a user other than the caller\n");
printf(" -c Provide console CLI\n");
printf(" -d Enable extra debugging\n");
+#if HAVE_WORKING_FORK
printf(" -f Do not fork\n");
+ printf(" -F Always fork\n");
+#endif
printf(" -g Dump core in case of a crash\n");
printf(" -h This help screen\n");
printf(" -i Initialize crypto keys at startup\n");
@@ -2209,12 +2216,14 @@
if (sscanf(v->value, "%d", &option_debug) != 1) {
option_debug = ast_true(v->value);
}
+#if HAVE_WORKING_FORK
/* Disable forking (-f at startup) */
} else if (!strcasecmp(v->name, "nofork")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_NO_FORK);
/* Always fork, even if verbose or debug are enabled (-F at startup) */
} else if (!strcasecmp(v->name, "alwaysfork")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_ALWAYS_FORK);
+#endif
/* Run quietly (-q at startup ) */
} else if (!strcasecmp(v->name, "quiet")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_QUIET);
@@ -2326,18 +2335,20 @@
/* Check for options */
while ((c = getopt(argc, argv, "mtThfdvVqprRgciInx:U:G:C:L:M:")) != -1) {
switch (c) {
+#if HAVE_WORKING_FORK
case 'F':
ast_set_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK);
break;
+ case 'f':
+ ast_set_flag(&ast_options, AST_OPT_FLAG_NO_FORK);
+ break;
+#endif
case 'd':
option_debug++;
ast_set_flag(&ast_options, AST_OPT_FLAG_NO_FORK);
break;
case 'c':
ast_set_flag(&ast_options, AST_OPT_FLAG_NO_FORK | AST_OPT_FLAG_CONSOLE);
- break;
- case 'f':
- ast_set_flag(&ast_options, AST_OPT_FLAG_NO_FORK);
break;
case 'n':
ast_set_flag(&ast_options, AST_OPT_FLAG_NO_COLOR);
@@ -2560,6 +2571,7 @@
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
+#if HAVE_WORKING_FORK
if (ast_opt_always_fork || !ast_opt_no_fork) {
daemon(0, 0);
ast_mainpid = getpid();
@@ -2572,6 +2584,7 @@
} else
ast_log(LOG_WARNING, "Unable to open pid file '%s': %s\n", ast_config_AST_PID, strerror(errno));
}
+#endif
/* Test recursive mutex locking. */
if (test_for_thread_safety())
@@ -2602,7 +2615,7 @@
printf(term_quit());
exit(1);
}
- if (load_modules()) {
+ if (load_modules(1)) {
printf(term_quit());
exit(1);
}
@@ -2661,6 +2674,11 @@
}
if (ast_enum_init()) {
+ printf(term_quit());
+ exit(1);
+ }
+
+ if (load_modules(0)) {
printf(term_quit());
exit(1);
}
@@ -2719,9 +2737,11 @@
}
/* Do nothing */
- for(;;) { /* apparently needed for the MACos */
+ for (;;) { /* apparently needed for Mac OS X */
struct pollfd p = { -1 /* no descriptor */, 0, 0 };
+
poll(&p, 0, -1);
}
+
return 0;
}
Modified: team/pcadach/chan_h323-live/main/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/db1-ast/Makefile?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/db1-ast/Makefile (original)
+++ team/pcadach/chan_h323-live/main/db1-ast/Makefile Tue Aug 22 08:23:58 2006
@@ -54,7 +54,7 @@
OSTYPE=$(shell uname -s)
ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-I../include -I../include/solaris-compat -DSOLARIS
+CFLAGS+=-I../../include -I../../include/solaris-compat -DSOLARIS
endif
db_dump185.o: db_dump185.c
Modified: team/pcadach/chan_h323-live/main/editline/Makefile.in
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/editline/Makefile.in?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/editline/Makefile.in (original)
+++ team/pcadach/chan_h323-live/main/editline/Makefile.in Tue Aug 22 08:23:58 2006
@@ -27,7 +27,7 @@
PREFIX = @prefix@
ifeq ($(OSTYPE),SunOS)
-CFLAGS+=-DSOLARIS -I../include/solaris-compat
+CFLAGS+=-DSOLARIS -I../../include/solaris-compat
endif
# .c files.
Modified: team/pcadach/chan_h323-live/main/loader.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/loader.c?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/loader.c (original)
+++ team/pcadach/chan_h323-live/main/loader.c Tue Aug 22 08:23:58 2006
@@ -667,7 +667,7 @@
return order;
}
-int load_modules(void)
+int load_modules(unsigned int preload_only)
{
struct ast_config *cfg;
struct ast_module *mod;
@@ -699,14 +699,22 @@
AST_LIST_HEAD_INIT_NOLOCK(&load_order);
- /* first, find all the modules we have been explicitly requested to load */
- for (v = ast_variable_browse(cfg, "modules"); v; v = v->next) {
- if (!strcasecmp(v->name, "load"))
- add_to_load_order(v->value, &load_order);
+ if (preload_only) {
+ /* first, find all the modules we have been explicitly requested to load */
+ for (v = ast_variable_browse(cfg, "modules"); v; v = v->next) {
+ if (!strcasecmp(v->name, "preload"))
+ add_to_load_order(v->value, &load_order);
+ }
+ } else {
+ /* first, find all the modules we have been explicitly requested to load */
+ for (v = ast_variable_browse(cfg, "modules"); v; v = v->next) {
+ if (!strcasecmp(v->name, "load"))
+ add_to_load_order(v->value, &load_order);
+ }
}
/* check if 'autoload' is on */
- if (ast_true(ast_variable_retrieve(cfg, "modules", "autoload"))) {
+ if (!preload_only && ast_true(ast_variable_retrieve(cfg, "modules", "autoload"))) {
/* if so, first add all the embedded modules to the load order */
AST_LIST_TRAVERSE(&module_list, mod, entry) {
order = add_to_load_order(mod->resource, &load_order);
Modified: team/pcadach/chan_h323-live/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/main/pbx.c?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/main/pbx.c (original)
+++ team/pcadach/chan_h323-live/main/pbx.c Tue Aug 22 08:23:58 2006
@@ -238,7 +238,7 @@
static int pbx_builtin_importvar(struct ast_channel *, void *);
AST_MUTEX_DEFINE_STATIC(globalslock);
-static struct varshead globals;
+static struct varshead globals = AST_LIST_HEAD_NOLOCK_INIT_VALUE;
static int autofallthrough = 0;
@@ -5681,7 +5681,6 @@
ast_verbose( "Asterisk PBX Core Initializing\n");
ast_verbose( "Registering builtin applications:\n");
}
- AST_LIST_HEAD_INIT_NOLOCK(&globals);
ast_cli_register_multiple(pbx_cli, sizeof(pbx_cli) / sizeof(pbx_cli[0]));
/* Register builtin applications */
Modified: team/pcadach/chan_h323-live/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/pbx/pbx_ael.c?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/pbx/pbx_ael.c (original)
+++ team/pcadach/chan_h323-live/pbx/pbx_ael.c Tue Aug 22 08:23:58 2006
@@ -59,7 +59,10 @@
static char *config = "extensions.ael";
static char *registrar = "pbx_ael";
-static int errs, warns, notes;
+static int errs, warns;
+#ifndef STANDALONE_AEL
+static int notes;
+#endif
#ifndef AAL_ARGCHECK
/* for the time being, short circuit all the AAL related structures
@@ -2089,6 +2092,7 @@
#endif
}
+#ifndef STANDALONE_AEL
static void check_context_names(void)
{
pval *i,*j;
@@ -2107,6 +2111,7 @@
}
}
}
+#endif
static void check_abstract_reference(pval *abstract_context)
{
Propchange: team/pcadach/chan_h323-live/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 22 08:23:58 2006
@@ -5,3 +5,4 @@
check_expr
streamplayer
aelparse
+muted
Modified: team/pcadach/chan_h323-live/utils/muted.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/utils/muted.c?rev=40834&r1=40833&r2=40834&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/utils/muted.c (original)
+++ team/pcadach/chan_h323-live/utils/muted.c Tue Aug 22 08:23:58 2006
@@ -223,7 +223,7 @@
sin.sin_family = AF_INET;
sin.sin_port = htons(port);
memcpy(&sin.sin_addr, hp->h_addr, sizeof(sin.sin_addr));
- if (connect(sock, &sin, sizeof(sin))) {
+ if (connect(sock, (struct sockaddr *)&sin, sizeof(sin))) {
fprintf(stderr, "Failed to connect to '%s' port '%d': %s\n", host, port, strerror(errno));
close(sock);
return -1;
More information about the asterisk-commits
mailing list