- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12926 - freeswitch/trunk
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 16:25:28 2009 New Revision: 12926 Log: add libtool major version detection to configure in prep for supporting both libtool 2.x and 1.5.x at the same time Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 16:25:28 2009 @@ -76,7 +76,7 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL -libtool=$(switch_builddir)/libtool +libtool=$switch_builddir/libtool LIBTOOL_MAJOR_VERSION=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'| awk -F . '{print $1}'` #Check for compiler vendor

1 0

[commit] r12925 - freeswitch/trunk/src/mod/endpoints/mod_loopback
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: anthm Date: Mon Apr 6 16:01:14 2009 New Revision: 12925 Log: null out pointer on failed read lock Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Mon Apr 6 16:01:14 2009 @@ -267,6 +267,7 @@ if (tech_pvt->other_session) { if (switch_core_session_read_lock(tech_pvt->other_session) != SWITCH_STATUS_SUCCESS) { + tech_pvt->other_session = NULL; switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); goto end; }

1 0

[commit] r12924 - freeswitch/trunk/src/include
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 15:54:50 2009 New Revision: 12924 Log: build: fix older gcc build (FSBUILD-150) Modified: freeswitch/trunk/src/include/switch.h Modified: freeswitch/trunk/src/include/switch.h ============================================================================== --- freeswitch/trunk/src/include/switch.h (original) +++ freeswitch/trunk/src/include/switch.h Mon Apr 6 15:54:50 2009 @@ -71,6 +71,7 @@ #include <setjmp.h> #include <ctype.h> #include <fcntl.h> +#include <string.h> #ifdef _MSC_VER #include <Winsock2.h> #if _MSC_VER < 1500 @@ -85,7 +86,6 @@ #else #include <strings.h> #endif -#include <string.h> #include <sys/stat.h> #include <limits.h> #include <sys/types.h>

1 0

[commit] r12923 - freeswitch/trunk/src/mod/endpoints/mod_opal
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 15:26:37 2009 New Revision: 12923 Log: mod_opal: disable visibility support broken in newer gcc (MODENDP-190) Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h Mon Apr 6 15:26:37 2009 @@ -26,12 +26,20 @@ #ifndef __FREESWITCH_MOD_OPAL__ #define __FREESWITCH_MOD_OPAL__ +#if defined(__GNUC__) && defined(HAVE_VISIBILITY) +#pragma GCC visibility push(default) +#endif + #include <ptlib.h> #include <opal/manager.h> #include <opal/localep.h> #include <h323/h323ep.h> #include <iax2/iax2ep.h> +#if defined(__GNUC__) && defined(HAVE_VISIBILITY) +#pragma GCC visibility pop +#endif + #undef strcasecmp #undef strncasecmp

1 0

[commit] r12922 - freeswitch/trunk
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 14:54:30 2009 New Revision: 12922 Log: add libtool major version detection to configure in prep for supporting both libtool 2.x and 1.5.x at the same time Modified: freeswitch/trunk/configure.in Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Apr 6 14:54:30 2009 @@ -76,6 +76,9 @@ AM_PROG_CC_C_O AC_PROG_LIBTOOL +libtool=$(switch_builddir)/libtool +LIBTOOL_MAJOR_VERSION=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'| awk -F . '{print $1}'` + #Check for compiler vendor AX_COMPILER_VENDOR @@ -123,6 +126,13 @@ ;; esac + +LIBTOOL_LIB_EXTEN="$DYNAMIC_LIB_EXTEN" + +if test "$LIBTOOL_MAJOR_VERSION" -eq "2"; then + LIBTOOL_LIB_EXTEN="la" +fi + # Enable 64 bit build AC_ARG_ENABLE(64, [AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"]) @@ -278,6 +288,7 @@ AC_SUBST(PLATFORM_CORE_DEPLIBS) AC_SUBST(SOLINK) AC_SUBST(DYNAMIC_LIB_EXTEN) +AC_SUBST(LIBTOOL_LIB_EXTEN) # Checks for header files. AC_HEADER_DIRENT

1 0

[commit] r12921 - in freeswitch/trunk: libs/esl/perl/ESL src
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 14:25:02 2009 New Revision: 12921 Log: fix play_and_get_digits to unset the var if the regex didn't match. and fix ESL/IVR to include the regex Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Mon Apr 6 14:25:02 2009 @@ -75,13 +75,13 @@ sub playAndGetDigits($;) { my $self = shift; - my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_; + my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var, $regex) = @_; if (!$self->{_esl}->connected()) { return undef; } - $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var"); + $self->execute("play_and_get_digits", "$min $max $tries $to $term $file $invalid_file $var $regex"); return $self->getVar($var); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Mon Apr 6 14:25:02 2009 @@ -1561,6 +1561,8 @@ } if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_SUCCESS; + } else { + switch_channel_set_variable(channel, var_name, NULL); } } }

1 0

[commit] r12920 - freeswitch/trunk/debian
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 14:02:19 2009 New Revision: 12920 Log: build: add python build dependency to debian package build (FSBUILD-145) Modified: freeswitch/trunk/debian/control Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Mon Apr 6 14:02:19 2009 @@ -2,7 +2,7 @@ Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra -Build-Depends: debhelper (>= 5), fakeroot, wget, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev +Build-Depends: debhelper (>= 5), fakeroot, wget, automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, libdb-dev, libgnutls-dev, libtiff4-dev, python Standards-Version: 3.7.3 Package: freeswitch

1 0

[commit] r12919 - in freeswitch/trunk/src: include mod/languages/mod_lua
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 13:53:43 2009 New Revision: 12919 Log: mod_lua: fix windows build (FSBUILD-149) Modified: freeswitch/trunk/src/include/switch_platform.h freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Apr 6 13:53:43 2009 @@ -148,10 +148,10 @@ #define SWITCH_MOD_DECLARE(type) type __cdecl #define SWITCH_MOD_DECLARE_DATA #elif defined(MOD_EXPORTS) -#define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __cdecl +#define SWITCH_MOD_DECLARE(type) __declspec(dllexport) type __stdcall #define SWITCH_MOD_DECLARE_DATA __declspec(dllexport) #else -#define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __cdecl +#define SWITCH_MOD_DECLARE(type) __declspec(dllimport) type __stdcall #define SWITCH_MOD_DECLARE_DATA __declspec(dllimport) #endif #define SIGHUP SIGTERM Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Mon Apr 6 13:53:43 2009 @@ -23,7 +23,7 @@ Session(char *uuid, CoreSession *a_leg = NULL); Session(switch_core_session_t *session); ~Session(); - virtual void destroy(void); + SWITCH_MOD_DECLARE(virtual void) destroy(void); virtual bool begin_allow_threads(); virtual bool end_allow_threads();

1 0

[commit] r12918 - freeswitch/trunk/src
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: anthm Date: Mon Apr 6 13:34:31 2009 New Revision: 12918 Log: don't answer in this case Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Apr 6 13:34:31 2009 @@ -324,12 +324,14 @@ if (ans_a != ans_b) { switch_channel_t *un = ans_a ? chan_b : chan_a; - if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un)); - goto end_of_bridge_loop; + if (!switch_channel_test_flag(un, CF_OUTBOUND)) { + if (switch_channel_answer(un) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(un)); + goto end_of_bridge_loop; + } + + if (ans_a) ans_b = 1; else ans_a = 1; } - - if (ans_a) ans_b = 1; else ans_a = 1; }

1 0

[commit] r12917 - freeswitch/trunk/libs/esl/perl/ESL
by FreeSWITCH SVN 06 Apr '09

06 Apr '09

Author: mikej Date: Mon Apr 6 12:39:07 2009 New Revision: 12917 Log: add ESL::IVR::setVar from intralanman Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Modified: freeswitch/trunk/libs/esl/perl/ESL/IVR.pm ============================================================================== --- freeswitch/trunk/libs/esl/perl/ESL/IVR.pm (original) +++ freeswitch/trunk/libs/esl/perl/ESL/IVR.pm Mon Apr 6 12:39:07 2009 @@ -55,6 +55,24 @@ } +sub setVar($;) { + my $self = shift; + my ($var, $val) = @_; + my $e = $self->api("uuid_setvar", "$self->{_uuid} $var $val"); + my $input; + if ($e) { + $input = $e->getBody() . "\n"; + if ($input eq "_undef_") { + $input = undef; + } + } + + chomp $input; + + return $input; + +} + sub playAndGetDigits($;) { my $self = shift; my ($min, $max, $tries, $to, $term, $file, $invalid_file, $var) = @_;

1 0