December 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r6481 - in freeswitch/trunk/src/mod: endpoints/mod_sofia event_handlers/mod_event_socket
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Mon Dec 3 19:21:32 2007 New Revision: 6481 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix SFSIP-37 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Mon Dec 3 19:21:32 2007 @@ -428,8 +428,9 @@ auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime); void sofia_reg_handle_sip_r_challenge(int status, - char const *phrase, - nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]); + char const *phrase, + nua_t *nua, sofia_profile_t *profile, + nua_handle_t *nh, switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]); void sofia_reg_handle_sip_r_register(int status, char const *phrase, nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_private_t *sofia_private, sip_t const *sip, tagi_t tags[]); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Mon Dec 3 19:21:32 2007 @@ -95,18 +95,26 @@ auth_res_t auth_res = AUTH_FORBIDDEN; switch_core_session_t *session = NULL; switch_channel_t *channel = NULL; + sofia_gateway_t *gateway = NULL; - if (sofia_private && !switch_strlen_zero(sofia_private->uuid)) { - if ((session = switch_core_session_locate(sofia_private->uuid))) { - tech_pvt = switch_core_session_get_private(session); - channel = switch_core_session_get_channel(tech_pvt->session); - if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { - tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id); - switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); + if (sofia_private) { + if ((gateway = sofia_private->gateway)) { + if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile %s is locked\n", gateway->profile->name); + return; + } + } else if (!switch_strlen_zero(sofia_private->uuid)) { + if ((session = switch_core_session_locate(sofia_private->uuid))) { + tech_pvt = switch_core_session_get_private(session); + channel = switch_core_session_get_channel(tech_pvt->session); + if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) { + tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id); + switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); + } + } else { + /* too late */ + return; } - } else { - /* too late */ - return; } } @@ -143,7 +151,7 @@ } if (sip && (status == 401 || status == 407)) { - sofia_reg_handle_sip_r_challenge(status, phrase, nua, profile, nh, session, sip, tags); + sofia_reg_handle_sip_r_challenge(status, phrase, nua, profile, nh, session, gateway, sip, tags); goto done; } @@ -251,6 +259,10 @@ done: + if (gateway) { + sofia_reg_release_gateway(gateway); + } + if (session) { switch_core_session_rwunlock(session); @@ -686,18 +698,10 @@ if ((gp = sofia_reg_find_gateway(gateway->name))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate gateway '%s'\n", gateway->name); sofia_reg_release_gateway(gp); - } else if ((gp=sofia_reg_find_gateway(gateway->register_from))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate uri '%s'\n", gateway->register_from); - sofia_reg_release_gateway(gp); - } else if ((gp=sofia_reg_find_gateway(gateway->register_contact))) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ignoring duplicate contact '%s'\n", gateway->register_contact); - sofia_reg_release_gateway(gp); } else { gateway->next = profile->gateways; profile->gateways = gateway; sofia_reg_add_gateway(gateway->name, gateway); - sofia_reg_add_gateway(gateway->register_from, gateway); - sofia_reg_add_gateway(gateway->register_contact, gateway); } } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Mon Dec 3 19:21:32 2007 @@ -660,13 +660,12 @@ } void sofia_reg_handle_sip_r_challenge(int status, - char const *phrase, - nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, switch_core_session_t *session, sip_t const *sip, tagi_t tags[]) + char const *phrase, + nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, + switch_core_session_t *session, sofia_gateway_t *gateway, sip_t const *sip, tagi_t tags[]) { - sofia_gateway_t *gateway = NULL; sip_www_authenticate_t const *authenticate = NULL; char const *realm = NULL; - char *p = NULL, *duprealm = NULL, *qrealm = NULL; char const *scheme = NULL; int indexnum; char *cur; @@ -705,68 +704,9 @@ return; } - if (profile) { - sofia_gateway_t *gateway_ptr = NULL; - - if ((duprealm = strdup(realm))) { - qrealm = duprealm; - - while (*qrealm && *qrealm == '"') { - qrealm++; - } - - if ((p = strchr(qrealm, '"'))) { - *p = '\0'; - } - - if (sip->sip_from) { - char *from_key = switch_mprintf("sip:%s@%s", - (char *) sip->sip_from->a_url->url_user, - (char *) sip->sip_from->a_url->url_host); - - if (!(gateway = sofia_reg_find_gateway(from_key))) { - gateway = sofia_reg_find_gateway(qrealm); - } - - switch_safe_free(from_key); - } - - if (!gateway) { - switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (gateway_ptr = profile->gateways; gateway_ptr; gateway_ptr = gateway_ptr->next) { - if (scheme && qrealm && !strcasecmp(gateway_ptr->register_scheme, scheme) - && !strcasecmp(gateway_ptr->register_realm, qrealm)) { - gateway = gateway_ptr; - - if (switch_thread_rwlock_tryrdlock(gateway->profile->rwlock) != SWITCH_STATUS_SUCCESS) { -#ifdef SOFIA_DEBUG_RWLOCKS - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Profile %s is locked\n", gateway->profile->name); -#endif - gateway = NULL; - } -#ifdef SOFIA_DEBUG_RWLOCKS - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XXXXXXXXXXXXXX GW LOCK %s\n", gateway->profile->name); -#endif - break; - } - } - switch_mutex_unlock(mod_sofia_globals.hash_mutex); - } - - if (!gateway) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Match for Scheme [%s] Realm [%s]\n", scheme, qrealm); - } - - switch_safe_free(duprealm); - - if (!gateway) { - goto cancel; - } - - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); - goto cancel; - } + if (!gateway) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Matching gateway found\n"); + goto cancel; } snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->register_username, gateway->register_password); @@ -779,16 +719,11 @@ tl_gets(tags, NUTAG_CALLSTATE_REF(ss_state), SIPTAG_WWW_AUTHENTICATE_REF(authenticate), TAG_END()); nua_authenticate(nh, SIPTAG_EXPIRES_STR(gateway->expires_str), NUTAG_AUTH(authentication), TAG_END()); - if (gateway) { - sofia_reg_release_gateway(gateway); - gateway = NULL; - } + return; cancel: - if (gateway) { - sofia_reg_release_gateway(gateway); - } + if (session) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_hangup(channel, SWITCH_CAUSE_MANDATORY_IE_MISSING); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Dec 3 19:21:32 2007 @@ -352,10 +352,16 @@ char *ptr; uint8_t crcount = 0; uint32_t max_len = sizeof(mbuf); + switch_channel_t *channel = NULL; *event = NULL; start = time(NULL); ptr = mbuf; + + if (listener->session) { + channel = switch_core_session_get_channel(listener->session); + } + while (listener->sock && !prefs.done) { uint8_t do_sleep = 1; mlen = 1; @@ -365,7 +371,7 @@ return SWITCH_STATUS_FALSE; } - if (listener->session && !switch_channel_ready(switch_core_session_get_channel(listener->session))) { + if (channel && !switch_channel_ready(channel)) { status = SWITCH_STATUS_FALSE; break; }

1 0

[commit] r6480 - in freeswitch/trunk/libs: codec/g726 codec/g7xx codec/ilbc codec/lpc10 iax js js/nsprpub libdingaling libresample libteletone speex srtp
by Freeswitch SVN 03 Dec '07

03 Dec '07

Author: anthm Date: Mon Dec 3 11:29:07 2007 New Revision: 6480 Modified: freeswitch/trunk/libs/codec/g726/configure.in freeswitch/trunk/libs/codec/g7xx/configure.in freeswitch/trunk/libs/codec/ilbc/configure.in freeswitch/trunk/libs/codec/lpc10/configure.ac freeswitch/trunk/libs/iax/configure.in freeswitch/trunk/libs/js/configure.ac freeswitch/trunk/libs/js/nsprpub/configure.in freeswitch/trunk/libs/libdingaling/configure.in freeswitch/trunk/libs/libresample/configure.in freeswitch/trunk/libs/libteletone/configure.in freeswitch/trunk/libs/speex/acinclude.m4 freeswitch/trunk/libs/speex/speex.m4 freeswitch/trunk/libs/srtp/configure.in Log: don't link to installed libs, patch from stkn (fix for MODLANG-47) Modified: freeswitch/trunk/libs/codec/g726/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/g726/configure.in (original) +++ freeswitch/trunk/libs/codec/g726/configure.in Mon Dec 3 11:29:07 2007 @@ -44,7 +44,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" @@ -64,7 +64,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" @@ -76,7 +76,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" @@ -84,6 +84,18 @@ fi DYNAMIC_LIB_EXTEN="so" ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; + i*6-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; esac # Enable 64 bit build AC_ARG_ENABLE(64, Modified: freeswitch/trunk/libs/codec/g7xx/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/g7xx/configure.in (original) +++ freeswitch/trunk/libs/codec/g7xx/configure.in Mon Dec 3 11:29:07 2007 @@ -38,12 +38,14 @@ case "$host" in *-solaris2*) - if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ IN_LINE="" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline @@ -63,7 +65,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -77,7 +79,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -87,6 +89,20 @@ DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; + i*6-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; esac # Enable 64 bit build Modified: freeswitch/trunk/libs/codec/ilbc/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/ilbc/configure.in (original) +++ freeswitch/trunk/libs/codec/ilbc/configure.in Mon Dec 3 11:29:07 2007 @@ -41,12 +41,14 @@ case "$host" in *-solaris2*) - if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ IN_LINE="" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline @@ -66,7 +68,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -80,7 +82,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -90,6 +92,20 @@ DYNAMIC_LIB_EXTEN="so" IN_LINE=inline ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; + i*6-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + IN_LINE=inline + ;; esac # Enable 64 bit build AC_ARG_ENABLE(64, Modified: freeswitch/trunk/libs/codec/lpc10/configure.ac ============================================================================== --- freeswitch/trunk/libs/codec/lpc10/configure.ac (original) +++ freeswitch/trunk/libs/codec/lpc10/configure.ac Mon Dec 3 11:29:07 2007 @@ -40,10 +40,12 @@ case "$host" in *-solaris2*) - if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + new_AM_LDFLAGS="-R${prefix}/lib" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline @@ -62,7 +64,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" @@ -74,7 +76,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" @@ -82,6 +84,18 @@ fi DYNAMIC_LIB_EXTEN="so" ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; + i*6-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; esac # Enable 64 bit build AC_ARG_ENABLE(64, Modified: freeswitch/trunk/libs/iax/configure.in ============================================================================== --- freeswitch/trunk/libs/iax/configure.in (original) +++ freeswitch/trunk/libs/iax/configure.in Mon Dec 3 11:29:07 2007 @@ -39,11 +39,13 @@ case "$host" in *-solaris2*) - if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" IN_LINE="" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline @@ -63,7 +65,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" @@ -76,7 +78,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fpic" @@ -89,7 +91,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" new_AM_CFLAGS="-fPIC" Modified: freeswitch/trunk/libs/js/configure.ac ============================================================================== --- freeswitch/trunk/libs/js/configure.ac (original) +++ freeswitch/trunk/libs/js/configure.ac Mon Dec 3 11:29:07 2007 @@ -179,8 +179,10 @@ if test ".$ac_cv_with_nspr" = ".yes"; then sinclude(nsprpub/config/nspr.m4) CPPFLAGS="$CPPFLAGS -DJS_THREADSAFE=1 -Insprpub/dist/include/nspr -Insprpub/pr/include" - LDFLAGS="$LDFLAGS -L$prefix/lib -L./nsprpub/dist/lib -lnspr4" + LDFLAGS="$LDFLAGS -L./nsprpub/dist/lib" + LIBS="$LIBS -lnspr4" LIBPATH="LD_LIBRARY_PATH=./nsprpub/dist/lib DYLD_LIBRARY_PATH=./nsprpub/dist/lib" + AC_CHECK_LIB(pthread, pthread_create, [CLI_LIBS="$CLI_LIBS -lpthread"]) fi AC_DEFUN([AX_COMPILER_VENDOR], Modified: freeswitch/trunk/libs/js/nsprpub/configure.in ============================================================================== --- freeswitch/trunk/libs/js/nsprpub/configure.in (original) +++ freeswitch/trunk/libs/js/nsprpub/configure.in Mon Dec 3 11:29:07 2007 @@ -1125,7 +1125,7 @@ AC_DEFINE(FREEBSD) AC_DEFINE(HAVE_BSD_FLOCK) AC_DEFINE(HAVE_SOCKLEN_T) - CFLAGS="$CFLAGS $(DSO_CFLAGS) -ansi -Wall" + CFLAGS="$CFLAGS -ansi -Wall" MOZ_OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` if test "$MOZ_OBJFORMAT" = "elf"; then DLL_SUFFIX=so @@ -1137,7 +1137,7 @@ DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)' MDCPUCFG_H=_freebsd.cfg PR_MD_CSRCS=freebsd.c - ;; + ;; *-hpux*) AC_DEFINE(XP_UNIX) Modified: freeswitch/trunk/libs/libdingaling/configure.in ============================================================================== --- freeswitch/trunk/libs/libdingaling/configure.in (original) +++ freeswitch/trunk/libs/libdingaling/configure.in Mon Dec 3 11:29:07 2007 @@ -42,12 +42,14 @@ case "$host" in *-solaris2*) - if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ IN_LINE="" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline @@ -67,7 +69,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -81,7 +83,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -95,7 +97,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Mon Dec 3 11:29:07 2007 @@ -47,12 +47,14 @@ case "$host" in *-solaris2*) - if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" + if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ IN_LINE="" - elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then SOLINK="-Bdynamic -dy -G" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-fPIC" new_AM_LDFLAGS="" IN_LINE=inline @@ -71,7 +73,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -84,7 +86,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -93,6 +95,18 @@ fi DYNAMIC_LIB_EXTEN="so" ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; + i*6-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; esac # Enable 64 bit build Modified: freeswitch/trunk/libs/libteletone/configure.in ============================================================================== --- freeswitch/trunk/libs/libteletone/configure.in (original) +++ freeswitch/trunk/libs/libteletone/configure.in Mon Dec 3 11:29:07 2007 @@ -39,7 +39,7 @@ *-solaris2*) if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" fi ;; *-darwin*) @@ -55,6 +55,14 @@ new_AM_CFLAGS="-fpic" new_AM_LDFLAGS="" ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + ;; + i*6-*-freebsd*) + new_AM_CFLAGS="-fpic" + new_AM_LDFLAGS="" + ;; esac AC_SUBST(new_AM_CFLAGS) AC_SUBST(new_AM_LDFLAGS) Modified: freeswitch/trunk/libs/speex/acinclude.m4 ============================================================================== --- freeswitch/trunk/libs/speex/acinclude.m4 (original) +++ freeswitch/trunk/libs/speex/acinclude.m4 Mon Dec 3 11:29:07 2007 @@ -19,7 +19,7 @@ elif test "x$ogg_prefix" != "x" ; then OGG_LIBS="-L$ogg_prefix/lib" elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" + OGG_LIBS="" fi OGG_LIBS="$OGG_LIBS -logg" Modified: freeswitch/trunk/libs/speex/speex.m4 ============================================================================== --- freeswitch/trunk/libs/speex/speex.m4 (original) +++ freeswitch/trunk/libs/speex/speex.m4 Mon Dec 3 11:29:07 2007 @@ -21,7 +21,7 @@ elif test "x$speex_prefix" != "x" ; then SPEEX_LIBS="-L$speex_prefix/lib" elif test "x$prefix" != "xNONE" ; then - SPEEX_LIBS="-L$prefix/lib" + SPEEX_LIBS="" fi SPEEX_LIBS="$SPEEX_LIBS -lspeex" Modified: freeswitch/trunk/libs/srtp/configure.in ============================================================================== --- freeswitch/trunk/libs/srtp/configure.in (original) +++ freeswitch/trunk/libs/srtp/configure.in Mon Dec 3 11:29:07 2007 @@ -40,7 +40,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ IN_LINE="" elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then @@ -63,7 +63,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -76,7 +76,7 @@ if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then SOLINK="-Bdynamic -dy -G" new_AM_CFLAGS="-KPIC -DPIC" - new_AM_LDFLAGS="-L${prefix}/lib -R${prefix}/lib" + new_AM_LDFLAGS="-R${prefix}/lib" FUNC_DEF=__func__ elif test "x${ax_cv_c_compiler_vendor}"="xgnu" ; then SOLINK="-shared -Xlinker -x" @@ -85,6 +85,18 @@ fi DYNAMIC_LIB_EXTEN="so" ;; + i*6*-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; + x86_64-*-freebsd*|amd64-*-freebsd*) + SOLINK="-shared -Xlinker -x" + new_AM_CFLAGS="-fPIC -Wall -O4 -fexpensive-optimizations -funroll-loops" + new_AM_LDFLAGS="" + DYNAMIC_LIB_EXTEN="so" + ;; esac # Enable 64 bit build

1 0

[commit] r6479 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 03 Dec '07

03 Dec '07

Author: anthm Date: Mon Dec 3 11:27:29 2007 New Revision: 6479 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: silence error Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Dec 3 11:27:29 2007 @@ -683,7 +683,7 @@ ename = cmd + 9; - while (ename && *ename == '\t' || *ename == ' ') { + while (ename && (*ename == '\t' || *ename == ' ')) { ++ename; }

1 0

[commit] r6478 - freeswitch/trunk/src
by Freeswitch SVN 03 Dec '07

03 Dec '07

Author: mikej Date: Mon Dec 3 11:17:28 2007 New Revision: 6478 Modified: freeswitch/trunk/src/switch_core.c Log: better file open failure check (FSCORE-67) Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Dec 3 11:17:28 2007 @@ -605,7 +605,8 @@ mime_path = switch_mprintf("%s/%s", SWITCH_GLOBAL_dirs.conf_dir, cf); assert(mime_path); - if (!(fd = open(mime_path, O_RDONLY))) { + fd = open(mime_path, O_RDONLY); + if (fd <= 0) { return; }

1 0

[commit] r6477 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 03 Dec '07

03 Dec '07

Author: mikej Date: Mon Dec 3 11:14:27 2007 New Revision: 6477 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: fix typo MODENDP-49 Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Mon Dec 3 11:14:27 2007 @@ -68,7 +68,7 @@   -  +

1 0

[commit] r6476 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 03 Dec '07

03 Dec '07

Author: mikej Date: Mon Dec 3 11:12:04 2007 New Revision: 6476 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: fix sql error due to wrong field name (MODENDP-50) Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Mon Dec 3 11:12:04 2007 @@ -784,7 +784,7 @@ switch_mutex_lock(profile->ireg_mutex); sql = switch_mprintf("delete from sip_subscriptions where " - "proto='%q' and user='%q' and host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q'", + "proto='%q' and sip_user='%q' and sip_host='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q'", proto, from_user, from_host,

1 0

[commit] r6475 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 03 Dec '07

03 Dec '07

Author: mikej Date: Mon Dec 3 11:06:47 2007 New Revision: 6475 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: fix for MODEVENT-2 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Dec 3 11:06:47 2007 @@ -682,7 +682,12 @@ strip_cr(cmd); ename = cmd + 9; - if (*ename == '\r' || *ename == '\n') { + + while (ename && *ename == '\t' || *ename == ' ') { + ++ename; + } + + if (ename && (*ename == '\r' || *ename == '\n')) { ename = NULL; }

1 0

[commit] r6474 - freeswitch/trunk/debian
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: cypromis Date: Sun Dec 2 18:50:45 2007 New Revision: 6474 Added: freeswitch/trunk/debian/freeswitch-codec-passthru-g7231.install - copied unchanged from r6467, /freeswitch/trunk/debian/freeswitch-codec-passthru-g723_1.install freeswitch/trunk/debian/freeswitch-lang-de.conffiles freeswitch/trunk/debian/freeswitch-lang-de.install freeswitch/trunk/debian/freeswitch-lang-en.conffiles freeswitch/trunk/debian/freeswitch-lang-en.install freeswitch/trunk/debian/freeswitch-lang-fr.conffiles freeswitch/trunk/debian/freeswitch-lang-fr.install freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles freeswitch/trunk/debian/postinst - copied unchanged from r6447, /freeswitch/trunk/debian/freeswitch.postinst freeswitch/trunk/debian/postrm - copied unchanged from r6447, /freeswitch/trunk/debian/freeswitch.postrm Removed: freeswitch/trunk/debian/freeswitch-codec-passthru-g723_1.install freeswitch/trunk/debian/freeswitch.postinst freeswitch/trunk/debian/freeswitch.postrm Modified: freeswitch/trunk/debian/compat freeswitch/trunk/debian/control freeswitch/trunk/debian/freeswitch-spidermonkey.install freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/rules Log: Looks like a pretty complete debian packaging done :) Modified: freeswitch/trunk/debian/compat ============================================================================== --- freeswitch/trunk/debian/compat (original) +++ freeswitch/trunk/debian/compat Sun Dec 2 18:50:45 2007 @@ -1 +1 @@ -5 +4 Modified: freeswitch/trunk/debian/control ============================================================================== --- freeswitch/trunk/debian/control (original) +++ freeswitch/trunk/debian/control Sun Dec 2 18:50:45 2007 @@ -1,5 +1,5 @@ Source: freeswitch -Maintainer: Michael Jerris <mike(a)jerris.com> +Maintainer: Michal Bielicki <michal.bielicki(a)voiceworks.pl> Section: net Priority: extra Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-dev, libssl-dev, ncurses-dev @@ -15,7 +15,6 @@ a soft-switch. It can be used as a simple switching engine, a media gateway or a media server to host IVR applications using simple scripts or XML to control the callflow. - . Homepage: http://www.freeswitch.org/ Package: freeswitch-spidermonkey @@ -26,11 +25,11 @@ Package: freeswitch-dev Architecture: any -Depends: ${shlibs:Depends} freswitch +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Development Package for the FreeSwitch open source telephony platform Homepage: http://www.freeswitch.org/ -Package: freeswitch-codec-passthru-g723_1 +Package: freeswitch-codec-passthru-g7231 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through g723.1 Codec support for the FreeSWITCH open source telephony platform @@ -47,3 +46,21 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch Description: Pass through g729 Codec support for the FreeSWITCH open source telephony platform Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-en +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: English language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-de +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: German language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ + +Package: freeswitch-lang-fr +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, freeswitch +Description: Frencch language files for the FreeSWITCH open source telephony platform +Homepage: http://www.freeswitch.org/ Added: freeswitch/trunk/debian/freeswitch-lang-de.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-de.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1,3 @@ +/opt/freeswitch/conf/lang/de/de.xml +/opt/freeswitch/conf/lang/de/demo/demo.xml +/opt/freeswitch/conf/lang/de/vm/tts.xml Added: freeswitch/trunk/debian/freeswitch-lang-de.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-de.install Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +opt/freeswitch/conf/lang/de/*.xml +opt/freeswitch/conf/lang/de/demo/*.xml +opt/freeswitch/conf/lang/de/vm/*.xml +opt/freeswitch/mod/mod_say_de.so* Added: freeswitch/trunk/debian/freeswitch-lang-en.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-en.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +/opt/freeswitch/conf/lang/en/en.xml +/opt/freeswitch/conf/lang/en/demo/demo.xml +/opt/freeswitch/conf/lang/en/vm/sounds.xml +/opt/freeswitch/conf/lang/en/vm/tts.xml Added: freeswitch/trunk/debian/freeswitch-lang-en.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-en.install Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +opt/freeswitch/conf/lang/en/*.xml +opt/freeswitch/conf/lang/en/demo/*.xml +opt/freeswitch/conf/lang/en/vm/*.xml +opt/freeswitch/mod/mod_say_en.so* Added: freeswitch/trunk/debian/freeswitch-lang-fr.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-fr.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1,3 @@ +/opt/freeswitch/conf/lang/fr/fr.xml +/opt/freeswitch/conf/lang/fr/demo/demo.xml +/opt/freeswitch/conf/lang/fr/vm/sounds.xml Added: freeswitch/trunk/debian/freeswitch-lang-fr.install ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-lang-fr.install Sun Dec 2 18:50:45 2007 @@ -0,0 +1,4 @@ +opt/freeswitch/conf/lang/fr/*.xml +opt/freeswitch/conf/lang/fr/demo/*.xml +opt/freeswitch/conf/lang/fr/vm/*.xml +opt/freeswitch/mod/mod_say_fr.so* Added: freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles ============================================================================== --- (empty file) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles Sun Dec 2 18:50:45 2007 @@ -0,0 +1 @@ +/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch-spidermonkey.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-spidermonkey.install (original) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.install Sun Dec 2 18:50:45 2007 @@ -3,3 +3,4 @@ opt/freeswitch/lib/libjs.so* opt/freeswitch/lib/libplds4.so* opt/freeswitch/lib/libplc4.so* +opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Sun Dec 2 18:50:45 2007 @@ -23,7 +23,6 @@ /opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml /opt/freeswitch/conf/autoload_configs/rss.conf.xml /opt/freeswitch/conf/autoload_configs/sofia.conf.xml -/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml /opt/freeswitch/conf/autoload_configs/switch.conf.xml /opt/freeswitch/conf/autoload_configs/syslog.conf.xml /opt/freeswitch/conf/autoload_configs/voicemail.conf.xml @@ -36,15 +35,5 @@ /opt/freeswitch/conf/dialplan/default.xml /opt/freeswitch/conf/dialplan/US.conf.xml /opt/freeswitch/conf/directory/default.xml -/opt/freeswitch/conf/lang/de/de.xml -/opt/freeswitch/conf/lang/de/demo/demo.xml -/opt/freeswitch/conf/lang/de/vm/tts.xml -/opt/freeswitch/conf/lang/en/en.xml -/opt/freeswitch/conf/lang/en/demo/demo.xml -/opt/freeswitch/conf/lang/en/vm/sounds.xml -/opt/freeswitch/conf/lang/en/vm/tts.xml -/opt/freeswitch/conf/lang/fr/fr.xml -/opt/freeswitch/conf/lang/fr/demo/demo.xml -/opt/freeswitch/conf/lang/fr/vm/sounds.xml /opt/freeswitch/conf/sip_profiles/default.xml /opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Sun Dec 2 18:50:45 2007 @@ -1,10 +1,6 @@ opt/freeswitch/htdocs/* opt/freeswitch/bin/freeswitch opt/freeswitch/lib/libfreeswitch*.so* -etc/init.d/freeswitch -etc/monit/freeswitch.monitrc -etc/default/freeswitch -opt/freeswitch/man/man1/freeswitch.1 opt/freeswitch/mod/mod_console.so* opt/freeswitch/mod/mod_syslog.so* opt/freeswitch/mod/mod_commands.so* @@ -13,24 +9,58 @@ opt/freeswitch/mod/mod_enum.so* opt/freeswitch/mod/mod_fifo.so* opt/freeswitch/mod/mod_openmrcp.so* -# Codecs opt/freeswitch/mod/mod_g711.so* opt/freeswitch/mod/mod_g722.so* opt/freeswitch/mod/mod_g726.so* opt/freeswutch/mod/mod_speex.so* -# Dialplan opt/freeswitch/mod/mod_dialplan*.so* -# Endpoints opt/freeswitch/mod/mod_dingaling.so* opt/freeswitch/mod/mod_iax.so* opt/freeswitch/mod/mod_portaudio.so* opt/freeswitch/mod/mod_sofia.so* opt/freeswitch/mod/mod_woomera.so* opt/freeswitch/mod/mod_openzap.so -# event engines opt/freeswitch/mod/mod_event_*.so* opt/freeswitch/mod/mod_native_file.so* opt/freeswitch/mod/mod_sndfile.so* opt/freeswitch/mod/mod_local_stream.so* opt/freeswitch/mod/mod_xml_*.so* -opt/freeswitch/mod/mod_say_*.so* +opt/freeswitch/conf/default_context_old.xml +opt/freeswitch/conf/extensions.conf +opt/freeswitch/conf/freeswitch.xml +opt/freeswitch/conf/mime.types +opt/freeswitch/conf/vars.xml +opt/freeswitch/conf/autoload_configs/alsa.conf.xml +opt/freeswitch/conf/autoload_configs/cdr.conf.xml +opt/freeswitch/conf/autoload_configs/conference.conf.xml +opt/freeswitch/conf/autoload_configs/console.conf.xml +opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml +opt/freeswitch/conf/autoload_configs/dingaling.conf.xml +opt/freeswitch/conf/autoload_configs/enum.conf.xml +opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml +opt/freeswitch/conf/autoload_configs/event_socket.conf.xml +opt/freeswitch/conf/autoload_configs/iax.conf.xml +opt/freeswitch/conf/autoload_configs/ivr.conf.xml +opt/freeswitch/conf/autoload_configs/java.conf.xml +opt/freeswitch/conf/autoload_configs/limit.conf.xml +opt/freeswitch/conf/autoload_configs/local_stream.conf.xml +opt/freeswitch/conf/autoload_configs/modules.conf.xml +opt/freeswitch/conf/autoload_configs/openmrcp.conf.xml +opt/freeswitch/conf/autoload_configs/portaudio.conf.xml +opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml +opt/freeswitch/conf/autoload_configs/rss.conf.xml +opt/freeswitch/conf/autoload_configs/sofia.conf.xml +opt/freeswitch/conf/autoload_configs/switch.conf.xml +opt/freeswitch/conf/autoload_configs/syslog.conf.xml +opt/freeswitch/conf/autoload_configs/voicemail.conf.xml +opt/freeswitch/conf/autoload_configs/wanpipe.conf.xml +opt/freeswitch/conf/autoload_configs/woomera.conf.xml +opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml +opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml +opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml +opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml +opt/freeswitch/conf/dialplan/default.xml +opt/freeswitch/conf/dialplan/US.conf.xml +opt/freeswitch/conf/directory/default.xml +opt/freeswitch/conf/sip_profiles/default.xml +opt/freeswitch/conf/sip_profiles/nat.xml Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Sun Dec 2 18:50:45 2007 @@ -3,9 +3,30 @@ # This file is public domain software, originally written by Joey Hess. # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export DH_OPTIONS +export DH_COMPAT=4 +export DEB_DH_INSTALL_SOURCEDIR=debian/tmp +export PASSTHRU_CODEC_MODULES=codecs/mod_g729 codecs/mod_g723_1 codecs/mod_amr +export SPIDERMONKEY_MODULES=languages/mod_spidermonkey languages/mod_spidermonkey_core_db languages/mod_spidermonkey_odbc languages/mod_spidermonkey_socket languages/mod_spidermonkey_teletone +export APPLICATIONS_MODULES=applications/mod_commands applications/mod_conference applications/mod_dptools applications/mod_enum applications/mod_esf applications/mod_expr applications/mod_fifo applications/mod_limit applications/mod_rss applications/mod_voicemail +export ASR_TTS_MODULES=asr_tts/mod_openmrcp +export CODECS_MODULES=codecs/mod_g711 codecs/mod_g722 codecs/mod_g726 codecs/mod_gsm codecs/mod_ilbc codecs/mod_h26x codecs/mod_l16 codecs/mod_speex +export DIALPLANS_MODULES=dialplans/mod_dialplan_asterisk dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml +export DIRECTORIES_MODULES= +export DOTNET_MODULES= +export ENDPOINTS_MODULES=endpoints/mod_dingaling endpoints/mod_iax endpoints/mod_portaudio endpoints/mod_sofia endpoints/mod_woomera ../../libs/openzap/mod_openzap +export EVENT_HANDLERS_MODULES=event_handlers/mod_event_multicast event_handlers/mod_event_socket +export FORMATS_MODULES=formats/mod_local_stream formats/mod_native_file formats/mod_sndfile +export LANGUAGES_MODULES= +export LOGGERS_MODULES=loggers/mod_console loggers/mod_logfile loggers/mod_syslog +export SAY_MODULES=say/mod_say_de say/mod_say_en say/mod_say_fr +export TIMERS_MODULES= +export DISABLED_MODULES=applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl +export XML_INT_MODULES=xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr +export MYMODULES=$(PASSTHRU_CODEC_MODULES) $(SPIDERMONKEY_MODULES) $(APPLICATIONS_MODULES) $(ASR_TTS_MODULES) $(CODECS_MODULES) $(DIALPLANS_MODULES) $(DIRECTORIES_MODULES) $(DOTNET_MODULES) $(ENDPOINTS_MODULES) $(EVENT_HANDLERS_MODULES) $(FORMATS_MODULES) $(LANGUAGES_MODULES) $(LOGGERS_MODULES) $(SAY_MODULES) $(TIMERS_MODULES) $(XML_INT_MODULES) +export MODULES=$(MYMODULES) -export MODULES ?= mod_console mod_syslog mod_commands mod_conference mod_dptools mod_enum mod_fifo mod_openmrcp mod_amr mod_g711 mod_g722 mod_g723_1 mod_g726 mod_g729 mod_gsm mod_ilbc mod_l16 mod_speex mod_dialplan_directory mod_dialplan_xml mod_dialplan_asterisk mod_dingaling mod_iax mod_portaudio mod_sofia mod_woomera mod_openzap mod_event_multicast mod_event_socket mod_native_file mod_sndfile mod_local_stream mod_spidermonkey mod_spidermonkey_teletone mod_spidermonkey_core_db mod_spidermonkey_odbc mod_xml_rpc mod_xml_curl mod_xml_cdr mod_say_en mod_say_fr mod_say_de ifndef AUTOCONF AUTOCONFS := $(wildcard /usr/bin/autoconf*) AUTOCONF = $(shell which autoconf) @@ -28,6 +49,10 @@ config.status: configure dh_testdir + rm modules.conf + touch modules.conf + echo $(MODULES) + for i in $(MODULES); do echo $$i >> modules.conf; done ./configure --prefix=/opt/freeswitch \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -65,7 +90,7 @@ dh_testdir dh_testroot dh_clean -k - dh_installdirs + dh_installdirs -A --sourcedir=debian/tmp $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install @@ -89,15 +114,13 @@ # dh_installcatalogs # dh_installpam # dh_installmime - dh_installinit + dh_installinit --sourcedir=debian/tmp # dh_installcron # dh_installinfo # dh_undocumented # dh_installman - dh_install --sourcedir=debian/tmp --autodest debian/monit/freeswitch.monitrc - dh_install --sourcedir=debian/tmp --autodest debian/default/freeswitch - dh_install --sourcedir=/debian/tmp --autodest debian/man/man1/freeswitch.1 - dh_link --sourcedir=debian/tmp opt/freeswitch/conf etc/opt/freeswitch + cp debian/monit/freeswitch.monitrc debian/freeswitch/etc/monit/freswitch.monitrc + cp debian/default/freeswitch debian/freeswitch/etc/default dh_install --sourcedir=debian/tmp dh_strip dh_compress

1 0

[commit] r6473 - in freeswitch/trunk/src: include mod/formats/mod_local_stream mod/formats/mod_shout
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: anthm Date: Sun Dec 2 11:01:56 2007 New Revision: 6473 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Log: add interval to file handles for streams Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Sun Dec 2 11:01:56 2007 @@ -279,6 +279,7 @@ /*! pre-buffer x bytes for streams */ uint32_t prebuf; /*! private data for the format module to store handle specific info */ + uint32_t interval; void *private_info; char *handler; int64_t pos; Modified: freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_local_stream/mod_local_stream.c Sun Dec 2 11:01:56 2007 @@ -174,13 +174,14 @@ handle->seekable = 0; handle->speed = 0; handle->private_info = context; + handle->interval = source->interval; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Opening Stream [%s] %dhz\n", path, handle->samplerate); switch_mutex_init(&context->audio_mutex, SWITCH_MUTEX_NESTED, handle->memory_pool); if (switch_buffer_create_dynamic(&context->audio_buffer, 512, 1024, 0) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n"); return SWITCH_STATUS_MEMERR; - } + } context->source = source; Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Sun Dec 2 11:01:56 2007 @@ -1123,6 +1123,7 @@ uint8_t buf[1024]; int rlen; int is_local = 0; + uint32_t interval = 20000; if (strstr(path_info + 7, "://")) { file = strdup(path_info + 7); @@ -1171,14 +1172,17 @@ path_info + 7); - + if (fh.interval) { + interval = fh.interval; + } + for(;;) { switch_size_t samples = sizeof(buf) / 2; switch_core_file_read(&fh, buf, &samples); if (is_local) { - switch_yield(20000); + switch_yield(interval); } if (!samples) {

1 0

[commit] r6472 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 02 Dec '07

02 Dec '07

Author: brian Date: Sat Dec 1 22:48:17 2007 New Revision: 6472 Modified: freeswitch/trunk/conf/sip_profiles/default.xml Log: one more fix Modified: freeswitch/trunk/conf/sip_profiles/default.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/default.xml (original) +++ freeswitch/trunk/conf/sip_profiles/default.xml Sat Dec 1 22:48:17 2007 @@ -1,7 +1,7 @@ <profile name="default">  <aliases> - <alias name="$${domain}"/> --> + <alias name="$${domain}"/> </aliases>  <gateways>

1 0