February 2009 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12066 - freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 13:40:58 2009 New Revision: 12066 Log: add makefile for ODBC define Added: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/Makefile Added: freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/dschreiber/mod_nibblebill/Makefile Mon Feb 16 13:40:58 2009 @@ -0,0 +1,3 @@ +BASE=../../../.. +include $(BASE)/build/modmake.rules +LOCAL_CFLAGS += `if test -f $(BASE)/.libs/libfreeswitch_la-switch_odbc.o ; then echo -DSWITCH_HAVE_ODBC; fi ;`

1 0

[commit] r12065 - freeswitch/trunk/src/include
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 13:32:06 2009 New Revision: 12065 Log: visibility tweak Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/include/switch_platform.h Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Mon Feb 16 13:32:06 2009 @@ -78,7 +78,7 @@ SWITCH_DECLARE(void) consoleLog(char *level_str, char *msg); SWITCH_DECLARE(void) consoleCleanLog(char *msg); - class CoreSession; + class SWITCH_DECLARE_CLASS CoreSession; class IVRMenu { protected: @@ -185,7 +185,7 @@ SWITCH_DECLARE(Event *) pop(int block = 0); }; - class CoreSession { + class SWITCH_DECLARE_CLASS CoreSession { protected: switch_input_args_t args; // holds ptr to cb function and input_callback_state struct // which has a language specific callback function Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Feb 16 13:32:06 2009 @@ -162,6 +162,7 @@ #define S_IWUSR _S_IWRITE #endif #define SWITCH_THREAD_FUNC __stdcall +#define SWITCH_DECLARE_CLASS #else //not win32 #define O_BINARY 0 #if (defined(__GNUC__) || defined(__SUNCC__)) && defined(SWITCH_API_VISIBILITY) @@ -170,12 +171,14 @@ #define SWITCH_DECLARE_DATA __attribute__((visibility("default"))) #define SWITCH_MOD_DECLARE(type) __attribute__((visibility("default"))) type #define SWITCH_MOD_DECLARE_DATA __attribute__((visibility("default"))) +#define SWITCH_DECLARE_CLASS __attribute__((visibility("default"))) #else #define SWITCH_DECLARE(type) type #define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_DECLARE_DATA #define SWITCH_MOD_DECLARE(type) type #define SWITCH_MOD_DECLARE_DATA +#define SWITCH_DECLARE_CLASS #endif #define SWITCH_THREAD_FUNC #endif

1 0

[commit] r12064 - in freeswitch/trunk/conf: . dialplan
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 13:01:50 2009 New Revision: 12064 Log: force domain_name to simplify things Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/dialplan/public.xml freeswitch/trunk/conf/vars.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Mon Feb 16 13:01:50 2009 @@ -20,28 +20,6 @@ <action application="deflect" data="${destination_number}"/> </condition> </extension> - -  - <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_sofia"/> - <condition field="${sip_auth_realm}" expression="^$"> - <action application="set" data="domain_name=$${domain}"/> - <anti-action application="set" data="domain_name=${sip_auth_realm}"/> - </condition> - </extension> - -  - <extension name="set_domain_openzap" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_openzap"> - <action application="set" data="domain_name=$${domain}"/> - </condition> - </extension>  <extension name="tod_example" continue="true"> Modified: freeswitch/trunk/conf/dialplan/public.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/public.xml (original) +++ freeswitch/trunk/conf/dialplan/public.xml Mon Feb 16 13:01:50 2009 @@ -36,17 +36,6 @@ </condition> </extension> -  - <extension name="set_domain" continue="true"> - <condition field="${domain_name}" expression="^$"/> - <condition field="source" expression="mod_sofia"/> - <condition field="${sip_req_params}" expression="domain_name=([A-Z-a-z0-9.]+)"> -  - <action application="export" data="domain_name=$1"/> - <anti-action application="export" data="domain_name=${sip_req_host}"/> - </condition> - </extension> - <extension name="public_extensions"> <condition field="destination_number" expression="^(10[01][0-9])$"> <action application="transfer" data="$1 XML default"/> Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Mon Feb 16 13:01:50 2009 @@ -11,6 +11,7 @@ information on this topic. --> <X-PRE-PROCESS cmd="set" data="domain=$${local_ip_v4}"/> + <X-PRE-PROCESS cmd="set" data="domain_name=$${domain}"/> <X-PRE-PROCESS cmd="set" data="hold_music=local_stream://moh"/> <!-- xmpp_client_profile and xmpp_server_profile

1 0

[commit] r12063 - freeswitch/branches/gmaruzz/mod_skypiax
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: gmaruzz Date: Mon Feb 16 12:57:51 2009 New Revision: 12063 Log: skypiax: added MPL license to mod_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Mon Feb 16 12:57:51 2009 @@ -1,3 +1,39 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * This module (mod_skypiax) has been contributed by: + * + * Giovanni Maruzzelli (gmaruzz(a)gmail.com) + * + * + * Further Contributors: + * + * + * + * mod_skypiax.c -- Skype compatible Endpoint Module + * + */ + #include "skypiax.h" SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load);

1 0

[commit] r12062 - freeswitch/trunk/src
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: anthm Date: Mon Feb 16 12:56:13 2009 New Revision: 12062 Log: FSCORE-300 Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Mon Feb 16 12:56:13 2009 @@ -800,7 +800,7 @@ } if (session->write_codec) { - if (!ptime_mismatch && + if (!ptime_mismatch && write_frame->codec && write_frame->codec->implementation && write_frame->codec->implementation->decoded_bytes_per_packet == session->write_impl.decoded_bytes_per_packet) { perfect = TRUE; }

1 0

[commit] r12061 - in freeswitch/trunk: . libs/libteletone libs/libteletone/src src/include
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mikej Date: Mon Feb 16 12:17:01 2009 New Revision: 12061 Log: API visibility support (GCC/SUNCC) (FSCORE-264) Modified: freeswitch/trunk/configure.in freeswitch/trunk/libs/libteletone/configure.in freeswitch/trunk/libs/libteletone/src/libteletone.h freeswitch/trunk/libs/libteletone/src/libteletone_detect.c freeswitch/trunk/libs/libteletone/src/libteletone_generate.c freeswitch/trunk/src/include/switch_platform.h Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Mon Feb 16 12:17:01 2009 @@ -151,6 +151,76 @@ fi fi +# +# gcc visibility cflag checks +# +AC_ARG_ENABLE([visibility], + [AS_HELP_STRING([--disable-visibility], [Disable or enable API visibility support (default: use if available)])], + [enable_visibility="${enableval}"], + [enable_visibility="detect"] +) +HAVE_VISIBILITY="no" + +if test "x${enable_visibility}" != "xno" ; then + + case "${ax_cv_c_compiler_vendor}" in + gnu) + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -fvisibility=hidden" + AC_MSG_CHECKING([whether the compiler supports -fvisibility=hidden]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [int foo __attribute__ ((visibility("default")));], + [;] + )], + + [AC_MSG_RESULT([yes]) + APR_ADDTO([SWITCH_AM_CFLAGS], [-fvisibility=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1]) + APR_ADDTO([SWITCH_AM_CXXFLAGS], [-fvisibility=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1]) + HAVE_VISIBILITY="yes"], + + [AC_MSG_RESULT([no])] + ) + CFLAGS="${save_CFLAGS}" + ;; + + sun) + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -xldscope=hidden" + AC_MSG_CHECKING([whether the compiler supports -xldscope=hidden]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [int foo __attribute__ ((visibility("default")));], + [;] + )], + + [AC_MSG_RESULT([yes]) + APR_ADDTO([SWITCH_AM_CFLAGS], [-xldscope=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1]) + APR_ADDTO([SWITCH_AM_CXXFLAGS], [-xldscope=hidden -DSWITCH_API_VISIBILITY=1 -DHAVE_VISIBILITY=1]) + HAVE_VISIBILITY="yes"], + + [AC_MSG_RESULT([no])] + ) + CFLAGS="${save_CFLAGS}" + ;; + + *) + if test "x${enable_visibility}" = "xyes" ; then + AC_MSG_ERROR([Non-GNU / SUN compilers are currently unsupported]) + else + AC_MSG_WARN([Non-GNU / SUN compilers are currently unsupported]) + fi + ;; + esac + + # + # visibility explicitly requested but not supported by this compiler => error + # + if test "x${enable_visibility}" = "xyes" -a "x${HAVE_VISIBILITY}" = "xno" ; then + AC_MSG_ERROR([API visibility not supported by this compiler]) + fi +fi + # Enable debugging (default: on) # (rename option if the default is changed) AC_ARG_ENABLE(debug, Modified: freeswitch/trunk/libs/libteletone/configure.in ============================================================================== --- freeswitch/trunk/libs/libteletone/configure.in (original) +++ freeswitch/trunk/libs/libteletone/configure.in Mon Feb 16 12:17:01 2009 @@ -7,11 +7,16 @@ AM_INIT_AUTOMAKE(libteletone,0.1) AC_CONFIG_SRCDIR([src]) +# disable checks +m4_defun([_LT_AC_LANG_CXX_CONFIG], [:]) +m4_defun([_LT_AC_LANG_F77_CONFIG], [:]) + # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_PROG_INSTALL + # Optimize AC_ARG_ENABLE(optimization, [AC_HELP_STRING([--enable-optimization],[Set if you want us to add max optimising compiler flags])],[enable_optimizer="$enableval"],[enable_optimizer="no"]) @@ -64,6 +69,77 @@ new_AM_LDFLAGS="" ;; esac + +# +# gcc visibility cflag checks +# +AC_ARG_ENABLE([visibility], + [AS_HELP_STRING([--disable-visibility], [Disable or enable API visibility support (default: use if available)])], + [enable_visibility="${enableval}"], + [enable_visibility="detect"] +) +HAVE_VISIBILITY="no" + +if test "x${enable_visibility}" != "xno" ; then + + case "${ax_cv_c_compiler_vendor}" in + gnu) + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -fvisibility=hidden" + AC_MSG_CHECKING([whether the compiler supports -fvisibility=hidden]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [int foo __attribute__ ((visibility("default")));], + [;] + )], + + [AC_MSG_RESULT([yes]) + new_AM_CFLAGS="${new_AM_CFLAGS} -fvisibility=hidden" + AC_DEFINE([HAVE_VISIBILITY], [1], [GCC visibility support available]) + HAVE_VISIBILITY="yes"], + + [AC_MSG_RESULT([no])] + ) + CFLAGS="${save_CFLAGS}" + ;; + + sun) + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -xldscope=hidden" + AC_MSG_CHECKING([whether the compiler supports -xldscope=hidden]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [int foo __attribute__ ((visibility("default")));], + [;] + )], + + [AC_MSG_RESULT([yes]) + new_AM_CFLAGS="${new_AM_CFLAGS} -xldscope=hidden" + AC_DEFINE([HAVE_VISIBILITY], [1], [SUNCC visibility support available]) + HAVE_VISIBILITY="yes"], + + [AC_MSG_RESULT([no])] + ) + CFLAGS="${save_CFLAGS}" + ;; + + *) + if test "x${enable_visibility}" = "xyes" ; then + AC_MSG_ERROR([Non-GNU / SUN compilers are currently unsupported]) + else + AC_MSG_WARN([Non-GNU / SUN compilers are currently unsupported]) + fi + ;; + esac + + # + # visibility explicitly requested but not supported by this compiler => error + # + if test "x${enable_visibility}" = "xyes" -a "x${HAVE_VISIBILITY}" = "xno" ; then + AC_MSG_ERROR([API visibility not supported by this compiler]) + fi +fi + AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) Modified: freeswitch/trunk/libs/libteletone/src/libteletone.h ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone.h (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone.h Mon Feb 16 12:17:01 2009 @@ -110,6 +110,12 @@ #define teletone_assert(expr) assert(expr) #endif +#if (defined(__GNUC__) || defined(__SUNCC__)) && defined(HAVE_VISIBILITY) +#define TELETONE_API __attribute__((visibility("default"))) +#else +#define TELETONE_API +#endif + #include <libteletone_generate.h> #include <libteletone_detect.h> Modified: freeswitch/trunk/libs/libteletone/src/libteletone_detect.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_detect.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_detect.c Mon Feb 16 12:17:01 2009 @@ -116,7 +116,7 @@ goertzel_state->fac = tdesc->fac; } -void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, +TELETONE_API void teletone_goertzel_update(teletone_goertzel_state_t *goertzel_state, int16_t sample_buffer[], int samples) { @@ -135,7 +135,7 @@ #define teletone_goertzel_result(gs) (double)(((gs)->v3 * (gs)->v3 + (gs)->v2 * (gs)->v2 - (gs)->v2 * (gs)->v3 * (gs)->fac)) -void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate) +TELETONE_API void teletone_dtmf_detect_init (teletone_dtmf_detect_state_t *dtmf_detect_state, int sample_rate) { int i; float theta; @@ -169,7 +169,7 @@ dtmf_detect_state->mhit = 0; } -void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map) +TELETONE_API void teletone_multi_tone_init(teletone_multi_tone_t *mt, teletone_tone_map_t *map) { float theta = 0; int x = 0; @@ -209,7 +209,7 @@ } -int teletone_multi_tone_detect (teletone_multi_tone_t *mt, +TELETONE_API int teletone_multi_tone_detect (teletone_multi_tone_t *mt, int16_t sample_buffer[], int samples) { @@ -299,7 +299,7 @@ } -int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API int teletone_dtmf_detect (teletone_dtmf_detect_state_t *dtmf_detect_state, int16_t sample_buffer[], int samples) { @@ -430,7 +430,7 @@ } -int teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, +TELETONE_API int teletone_dtmf_get (teletone_dtmf_detect_state_t *dtmf_detect_state, char *buf, int max) { Modified: freeswitch/trunk/libs/libteletone/src/libteletone_generate.c ============================================================================== --- freeswitch/trunk/libs/libteletone/src/libteletone_generate.c (original) +++ freeswitch/trunk/libs/libteletone/src/libteletone_generate.c Mon Feb 16 12:17:01 2009 @@ -99,7 +99,7 @@ }; -int teletone_set_tone(teletone_generation_session_t *ts, int index, ...) +TELETONE_API int teletone_set_tone(teletone_generation_session_t *ts, int index, ...) { va_list ap; int i = 0; @@ -115,7 +115,7 @@ } -int teletone_set_map(teletone_tone_map_t *map, ...) +TELETONE_API int teletone_set_map(teletone_tone_map_t *map, ...) { va_list ap; int i = 0; @@ -131,7 +131,7 @@ } -int teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data) +TELETONE_API int teletone_init_session(teletone_generation_session_t *ts, int buflen, tone_handler handler, void *user_data) { memset(ts, 0, sizeof(*ts)); ts->rate = 8000; @@ -174,7 +174,7 @@ return 0; } -int teletone_destroy_session(teletone_generation_session_t *ts) +TELETONE_API int teletone_destroy_session(teletone_generation_session_t *ts) { if (ts->buffer) { free(ts->buffer); @@ -203,7 +203,7 @@ return 0; } -int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map) +TELETONE_API int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *map) { /*teletone_process_t period = (1.0 / ts->rate) / ts->channels;*/ int i, c; @@ -318,7 +318,7 @@ return (char *) memcpy (new, s, len); } -int teletone_run(teletone_generation_session_t *ts, const char *cmd) +TELETONE_API int teletone_run(teletone_generation_session_t *ts, const char *cmd) { char *data = NULL, *cur = NULL, *end = NULL; int var = 0, LOOPING = 0; Modified: freeswitch/trunk/src/include/switch_platform.h ============================================================================== --- freeswitch/trunk/src/include/switch_platform.h (original) +++ freeswitch/trunk/src/include/switch_platform.h Mon Feb 16 12:17:01 2009 @@ -164,11 +164,19 @@ #define SWITCH_THREAD_FUNC __stdcall #else //not win32 #define O_BINARY 0 -#define SWITCH_DECLARE(type) type -#define SWITCH_DECLARE_NONSTD(type) type -#define SWITCH_MOD_DECLARE(type) type +#if (defined(__GNUC__) || defined(__SUNCC__)) && defined(SWITCH_API_VISIBILITY) +#define SWITCH_DECLARE(type) __attribute__((visibility("default"))) type +#define SWITCH_DECLARE_NONSTD(type) __attribute__((visibility("default"))) type +#define SWITCH_DECLARE_DATA __attribute__((visibility("default"))) +#define SWITCH_MOD_DECLARE(type) __attribute__((visibility("default"))) type +#define SWITCH_MOD_DECLARE_DATA __attribute__((visibility("default"))) +#else +#define SWITCH_DECLARE(type) type +#define SWITCH_DECLARE_NONSTD(type) type #define SWITCH_DECLARE_DATA +#define SWITCH_MOD_DECLARE(type) type #define SWITCH_MOD_DECLARE_DATA +#endif #define SWITCH_THREAD_FUNC #endif #define SWITCH_DECLARE_CONSTRUCTOR SWITCH_DECLARE_DATA

1 0

[commit] r12060 - freeswitch/trunk/debian
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 12:12:31 2009 New Revision: 12060 Log: fix adduser in debian (FSBUILD-122, FSBUILD-102) Modified: freeswitch/trunk/debian/postinst Modified: freeswitch/trunk/debian/postinst ============================================================================== --- freeswitch/trunk/debian/postinst (original) +++ freeswitch/trunk/debian/postinst Mon Feb 16 12:12:31 2009 @@ -25,8 +25,8 @@ adduser --disabled-password --quiet --system \ --home /opt/freeswitch \ --gecos "FreeSwitch Voice Platform" --ingroup daemon \ - --add_extra_groups audio \ freeswitch + adduser freeswitch audio fi mkdir -p /opt/freeswitch

1 0

[commit] r12059 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mrene Date: Mon Feb 16 11:58:02 2009 New Revision: 12059 Log: Make sure priority isnt fucked up Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Feb 16 11:58:02 2009 @@ -2021,7 +2021,7 @@ return; } - if (continue_on_fail && switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_num, continue_on_fail)) { + if (continue_on_fail && (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_num, continue_on_fail))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]: Cause: %s\n", continue_on_fail, cause_str); return; }

1 0

[commit] r12058 - freeswitch/trunk/src/mod/applications/mod_dptools
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: mrene Date: Mon Feb 16 11:56:21 2009 New Revision: 12058 Log: Add failure_causes channel variable Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Mon Feb 16 11:56:21 2009 @@ -1959,7 +1959,7 @@ switch_channel_t *caller_channel = switch_core_session_get_channel(session); switch_core_session_t *peer_session = NULL; unsigned int timelimit = 60; - const char *var, *continue_on_fail = NULL; + const char *var, *continue_on_fail = NULL, *failure_causes = NULL; uint8_t no_media_bridge = 0; switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; @@ -1972,6 +1972,7 @@ } continue_on_fail = switch_channel_get_variable(caller_channel, "continue_on_fail"); + failure_causes = switch_channel_get_variable(caller_channel, "failure_causes"); if ((var = switch_channel_get_variable(caller_channel, SWITCH_PROXY_MEDIA_VARIABLE)) && switch_true(var)) { switch_channel_set_flag(caller_channel, CF_PROXY_MEDIA); @@ -2006,19 +2007,24 @@ 'true' to continue on all failures. 'false' to not continue. A list of codes either names or numbers eg "user_busy,normal_temporary_failure,603" + failure_causes acts as the opposite version */ - if (continue_on_fail) { + if (continue_on_fail || failure_causes) { const char *cause_str; char cause_num[35] = ""; cause_str = switch_channel_cause2str(cause); switch_snprintf(cause_num, sizeof(cause_num), "%u", cause); - - if (switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_num, continue_on_fail)) { + + if (failure_causes && !(switch_stristr(cause_str, failure_causes) || strstr(cause_num, failure_causes))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Failiure causes [%s]: Cause: %s\n", failure_causes, cause_str); + return; + } + + if (continue_on_fail && switch_true(continue_on_fail) || switch_stristr(cause_str, continue_on_fail) || strstr(cause_num, continue_on_fail)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Continue on fail [%s]: Cause: %s\n", continue_on_fail, cause_str); return; } - } if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && switch_channel_get_state(caller_channel) != CS_ROUTING) { switch_channel_hangup(caller_channel, cause);

1 0

[commit] r12057 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 16 Feb '09

16 Feb '09

Author: brian Date: Mon Feb 16 11:52:55 2009 New Revision: 12057 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Mon Feb 16 11:52:55 2009 @@ -7522,18 +7522,6 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_launch_thread(void * jarg1, void * jarg2, void * jarg3) { - void *(*arg1)(switch_thread_t *,void *) = (void *(*)(switch_thread_t *,void *)) 0 ; - void *arg2 = (void *) 0 ; - switch_memory_pool_t *arg3 = (switch_memory_pool_t *) 0 ; - - arg1 = (void *(*)(switch_thread_t *,void *))jarg1; - arg2 = (void *)jarg2; - arg3 = (switch_memory_pool_t *)jarg3; - switch_core_launch_thread(arg1,arg2,arg3); -} - - SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_set_globals() { switch_core_set_globals(); } Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Mon Feb 16 11:52:55 2009 @@ -1812,10 +1812,6 @@ return ret; } - public static void switch_core_launch_thread(SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void func, SWIGTYPE_p_void obj, SWIGTYPE_p_apr_pool_t pool) { - freeswitchPINVOKE.switch_core_launch_thread(SWIGTYPE_p_f_p_switch_thread_t_p_void__p_void.getCPtr(func), SWIGTYPE_p_void.getCPtr(obj), SWIGTYPE_p_apr_pool_t.getCPtr(pool)); - } - public static void switch_core_set_globals() { freeswitchPINVOKE.switch_core_set_globals(); } @@ -6153,9 +6149,6 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_get_console")] public static extern IntPtr switch_core_get_console(); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_launch_thread")] - public static extern void switch_core_launch_thread(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_set_globals")] public static extern void switch_core_set_globals();

1 0