[svn-commits] russell: branch russell/bindings r121437 - in /team/russell/bindings: ./ buil...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jun 9 21:44:17 CDT 2008
Author: russell
Date: Mon Jun 9 21:44:16 2008
New Revision: 121437
URL: http://svn.digium.com/view/asterisk?view=rev&rev=121437
Log:
resolve, reset
Modified:
team/russell/bindings/ (props changed)
team/russell/bindings/build_tools/menuselect-deps.in
team/russell/bindings/channels/chan_iax2.c
team/russell/bindings/configure.ac
team/russell/bindings/include/asterisk/autoconfig.h.in
team/russell/bindings/main/taskprocessor.c
team/russell/bindings/makeopts.in
Propchange: team/russell/bindings/
------------------------------------------------------------------------------
automerge = *
Propchange: team/russell/bindings/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 9 21:44:16 2008
@@ -1,1 +1,1 @@
-/trunk:1-121388
+/trunk:1-121436
Modified: team/russell/bindings/build_tools/menuselect-deps.in
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/build_tools/menuselect-deps.in?view=diff&rev=121437&r1=121436&r2=121437
==============================================================================
--- team/russell/bindings/build_tools/menuselect-deps.in (original)
+++ team/russell/bindings/build_tools/menuselect-deps.in Mon Jun 9 21:44:16 2008
@@ -30,6 +30,8 @@
PORTAUDIO=@PBX_PORTAUDIO@
PRI=@PBX_PRI@
PYTHON=@PBX_PYTHON@
+SACLM=@PBX_SACLM@
+SAEVT=@PBX_SAEVT@
RADIUS=@PBX_RADIUS@
SPANDSP=@PBX_SPANDSP@
SPEEX=@PBX_SPEEX@
Modified: team/russell/bindings/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/channels/chan_iax2.c?view=diff&rev=121437&r1=121436&r2=121437
==============================================================================
--- team/russell/bindings/channels/chan_iax2.c (original)
+++ team/russell/bindings/channels/chan_iax2.c Mon Jun 9 21:44:16 2008
@@ -9683,13 +9683,13 @@
}
if (!reg->callno) {
- ast_debug(1, "Allocate call number\n");
+ ast_debug(3, "Allocate call number\n");
reg->callno = find_callno_locked(0, 0, ®->addr, NEW_FORCE, defaultsockfd, 0);
if (reg->callno < 1) {
ast_log(LOG_WARNING, "Unable to create call for registration\n");
return -1;
} else
- ast_debug(1, "Registration created on call %d\n", reg->callno);
+ ast_debug(3, "Registration created on call %d\n", reg->callno);
iaxs[reg->callno]->reg = reg;
ast_mutex_unlock(&iaxsl[reg->callno]);
}
Modified: team/russell/bindings/configure.ac
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/configure.ac?view=diff&rev=121437&r1=121436&r2=121437
==============================================================================
--- team/russell/bindings/configure.ac (original)
+++ team/russell/bindings/configure.ac Mon Jun 9 21:44:16 2008
@@ -249,6 +249,8 @@
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
+AST_EXT_LIB_SETUP([SACLM], [SAForum AIS CLM], [SaClm])
+AST_EXT_LIB_SETUP([SAEVT], [SAForum AIS EVT], [SaEvt])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
@@ -1482,6 +1484,9 @@
AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
+AST_EXT_LIB_CHECK([SACLM], [SaClm], [saClmInitialize], [openais/saClm.h])
+AST_EXT_LIB_CHECK([SAEVT], [SaEvt], [saEvtInitialize], [openais/saEvt.h])
+
AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
# See if the main speex library contains the preprocess functions
Modified: team/russell/bindings/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/include/asterisk/autoconfig.h.in?view=diff&rev=121437&r1=121436&r2=121437
==============================================================================
--- team/russell/bindings/include/asterisk/autoconfig.h.in (original)
+++ team/russell/bindings/include/asterisk/autoconfig.h.in Mon Jun 9 21:44:16 2008
@@ -681,6 +681,18 @@
/* Define RTLD_NOLOAD headers version */
#undef HAVE_RTLD_NOLOAD_VERSION
+
+/* Define this to indicate the ${SACLM_DESCRIP} library */
+#undef HAVE_SACLM
+
+/* Define to indicate the ${SACLM_DESCRIP} library version */
+#undef HAVE_SACLM_VERSION
+
+/* Define this to indicate the ${SAEVT_DESCRIP} library */
+#undef HAVE_SAEVT
+
+/* Define to indicate the ${SAEVT_DESCRIP} library version */
+#undef HAVE_SAEVT_VERSION
/* Define to 1 if your system has /sbin/launchd. */
#undef HAVE_SBIN_LAUNCHD
Modified: team/russell/bindings/main/taskprocessor.c
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/main/taskprocessor.c?view=diff&rev=121437&r1=121436&r2=121437
==============================================================================
--- team/russell/bindings/main/taskprocessor.c (original)
+++ team/russell/bindings/main/taskprocessor.c Mon Jun 9 21:44:16 2008
@@ -23,7 +23,11 @@
*/
#include "asterisk.h"
+
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include <signal.h>
+#include <sys/time.h>
#include "asterisk/_private.h"
#include "asterisk/module.h"
@@ -31,8 +35,6 @@
#include "asterisk/astobj2.h"
#include "asterisk/cli.h"
#include "asterisk/taskprocessor.h"
-#include "signal.h"
-#include "sys/time.h"
/*! \brief tps_task structure is queued to a taskprocessor
@@ -84,8 +86,9 @@
/*! \brief CLI 'taskprocessor ping <blah>' operation requires a ping condition */
static ast_cond_t cli_ping_cond;
+
/*! \brief CLI 'taskprocessor ping <blah>' operation requires a ping condition lock */
-static ast_mutex_t cli_ping_cond_lock;
+AST_MUTEX_DEFINE_STATIC(cli_ping_cond_lock);
/*! \brief The astobj2 hash callback for taskprocessors */
static int tps_hash_cb(const void *obj, const int flags);
@@ -122,6 +125,9 @@
ast_log(LOG_ERROR, "taskprocessor container failed to initialize!\n");
return -1;
}
+
+ ast_cond_init(&cli_ping_cond, NULL);
+
ast_cli_register_multiple(taskprocessor_clis, ARRAY_LEN(taskprocessor_clis));
return 0;
}
Modified: team/russell/bindings/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/russell/bindings/makeopts.in?view=diff&rev=121437&r1=121436&r2=121437
==============================================================================
--- team/russell/bindings/makeopts.in (original)
+++ team/russell/bindings/makeopts.in Mon Jun 9 21:44:16 2008
@@ -158,6 +158,12 @@
PWLIB_INCLUDE=@PWLIB_INCLUDE@
PWLIB_LIB=@PWLIB_LIB@
+SACLM_INCLUDE=@SACLM_INCLUDE@
+SACLM_LIB=@SACLM_LIB@
+
+SAEVT_INCLUDE=@SAEVT_INCLUDE@
+SAEVT_LIB=@SAEVT_LIB@
+
RADIUS_INCLUDE=@RADIUS_INCLUDE@
RADIUS_LIB=@RADIUS_LIB@
More information about the svn-commits
mailing list