March 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r12590 - freeswitch/trunk/src
by FreeSWITCH SVN 13 Mar '09

13 Mar '09

Author: brian Date: Thu Mar 12 20:57:10 2009 New Revision: 12590 Log: FSCORE-332 Modified: freeswitch/trunk/src/switch_core_session.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Mar 12 20:57:10 2009 @@ -379,6 +379,7 @@ peer_profile = switch_channel_get_caller_profile(peer_channel); if ((use_uuid = switch_event_get_header(var_event, "origination_uuid"))) { + use_uuid = switch_core_session_strdup(*new_session, use_uuid); if (switch_core_session_set_uuid(*new_session, use_uuid) == SWITCH_STATUS_SUCCESS) { switch_event_del_header(var_event, "origination_uuid"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(peer_channel), use_uuid); @@ -1068,14 +1069,15 @@ switch_assert(use_uuid); + switch_mutex_lock(runtime.session_hash_mutex); if (switch_core_hash_find(session_manager.session_table, use_uuid)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Duplicate UUID!\n"); + switch_mutex_unlock(runtime.session_hash_mutex); return SWITCH_STATUS_FALSE; } switch_event_create(&event, SWITCH_EVENT_CHANNEL_UUID); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Old-Unique-ID", session->uuid_str); - switch_mutex_lock(runtime.session_hash_mutex); switch_core_hash_delete(session_manager.session_table, session->uuid_str); switch_set_string(session->uuid_str, use_uuid); switch_core_hash_insert(session_manager.session_table, session->uuid_str, session);

1 0

[commit] r12588 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: andrew Date: Thu Mar 12 14:57:22 2009 New Revision: 12588 Log: Remove old hardcoded makefile now that we can check for erlang stuff in configure Removed: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/Makefile

1 0

[commit] r12587 - in freeswitch/trunk: . build build/config
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: andrew Date: Thu Mar 12 14:54:20 2009 New Revision: 12587 Log: FSBUILD-142 (with approval from MikeJ) Added: freeswitch/trunk/build/config/erlang.m4 Modified: freeswitch/trunk/acinclude.m4 freeswitch/trunk/build/modules.conf.in freeswitch/trunk/configure.in Modified: freeswitch/trunk/acinclude.m4 ============================================================================== --- freeswitch/trunk/acinclude.m4 (original) +++ freeswitch/trunk/acinclude.m4 Thu Mar 12 14:54:20 2009 @@ -6,6 +6,7 @@ m4_include([build/config/ac_gcc_x86_cpuid.m4]) m4_include([build/config/ax_lib_mysql.m4]) m4_include([build/config/ax_check_java.m4]) +m4_include([build/config/erlang.m4]) m4_include([build/config/odbc.m4]) m4_include([libs/apr/build/apr_common.m4]) m4_include([build/config/libcurl.m4]) Added: freeswitch/trunk/build/config/erlang.m4 ============================================================================== --- (empty file) +++ freeswitch/trunk/build/config/erlang.m4 Thu Mar 12 14:54:20 2009 @@ -0,0 +1,96 @@ +AC_DEFUN([CHECK_ERLANG], [ +# +# Erlang checks for mod_erlang_event +# +AC_ARG_WITH( + [erlang], + [AS_HELP_STRING([--with-erlang], [Use system provided version of erlang (default: try)])], + [with_erlang="$withval"], + [with_erlang="try"] +) + +if test "$with_erlang" != "no" +then + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" + + if test "$with_erlang" != "yes" -a "$with_erlang" != "try" ; then + AC_MSG_CHECKING([for erlang]) + if test ! -x "$with_erlang" ; then + AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang]) + fi + AC_MSG_RESULT([$with_erlang]) + AC_SUBST([ERLANG], ["$with_erlang"]) + else + AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"]) + fi + + if test "$ERLANG" != "no" ; then + AC_MSG_CHECKING([erlang version]) + ERLANG_VER="`$ERLANG -version 2>&1 | cut -d' ' -f6`" + + if test -z "$ERLANG_VER" ; then + AC_MSG_ERROR([Unable to detect erlang version]) + fi + AC_MSG_RESULT([$ERLANG_VER]) + + ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt` + AC_MSG_CHECKING([erlang libdir]) + if test -z "`echo $ERLANG_LIBDIR`" ; then + AC_MSG_ERROR([failed]) + else + ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS" + LIBS="-L$ERLANG_LIBDIR $LIBS" + fi + AC_MSG_RESULT([$ERLANG_LIBDIR]) + + ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt` + AC_MSG_CHECKING([erlang incdir]) + if test -z "`echo $ERLANG_INCDIR`" ; then + AC_MSG_ERROR([failed]) + else + ERLANG_CFLAGS="-I$ERLANG_INCDIR $ERLANG_CFLAGS" + CFLAGS="-I$ERLANG_INCDIR $CFLAGS" + fi + AC_MSG_RESULT([$ERLANG_INCDIR]) + + AC_CHECK_HEADERS([ei.h], [has_ei_h="yes"], [has_ei_h="no"]) + + ERLANG_LIB="ei" + + # check liei + AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"]) + # maybe someday ei will actually expose this? + AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"]) + + if test "$has_libei" = "no" ; then + AS_IF([test "$with_erlang" = "try"], + [AC_MSG_WARN([$ERLANG_LIB is unusable])], + [AC_MSG_ERROR([$ERLANG_LIB is unusable])] + ) + elif test "$has_ei_h" = "no"; then + AS_IF([test "$with_erlang" = "try"], + [AC_MSG_WARN([ei.h is unusable - are the erlang development headers installed?])], + [AC_MSG_ERROR([ei.h is unusable - are the erlang development headers installed?])] + ) + else + ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei" + AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf]) + AC_SUBST([ERLANG_CFLAGS], [$ERLANG_CFLAGS]) + AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS]) + fi + + LIBS="$save_LIBS" + CFLAGS="$save_CFLAGS" + + else + AS_IF([test "$with_erlang" = "try"], + [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])], + [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])] + ) + fi +else + AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!]) +fi + +]) Modified: freeswitch/trunk/build/modules.conf.in ============================================================================== --- freeswitch/trunk/build/modules.conf.in (original) +++ freeswitch/trunk/build/modules.conf.in Thu Mar 12 14:54:20 2009 @@ -50,6 +50,7 @@ event_handlers/mod_event_socket event_handlers/mod_cdr_csv #event_handlers/mod_radius_cdr +#event_handlers/mod_erlang_event formats/mod_native_file formats/mod_sndfile #formats/mod_shout Modified: freeswitch/trunk/configure.in ============================================================================== --- freeswitch/trunk/configure.in (original) +++ freeswitch/trunk/configure.in Thu Mar 12 14:54:20 2009 @@ -692,6 +692,8 @@ AC_MSG_WARN([python support disabled, building mod_python will fail!]) fi +CHECK_ERLANG + AC_CONFIG_FILES([Makefile src/Makefile src/mod/Makefile @@ -699,6 +701,7 @@ src/mod/event_handlers/mod_radius_cdr/Makefile src/mod/languages/mod_java/Makefile src/mod/languages/mod_python/Makefile + src/mod/event_handlers/mod_erlang_event/Makefile src/include/switch_am_config.h build/getsounds.sh build/getlib.sh

1 0

[commit] r12586 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: mrene Date: Thu Mar 12 13:51:36 2009 New Revision: 12586 Log: MDXMLINT-48 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Thu Mar 12 13:51:36 2009 @@ -198,8 +198,11 @@ curl_easy_setopt(curl_handle, CURLOPT_SSL_VERIFYHOST, 0); } + memset(&config_data, 0, sizeof(config_data)); + config_data.name = filename; config_data.max_bytes = XML_CURL_MAX_BYTES; + if ((config_data.fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR)) > -1) { if (!switch_strlen_zero(binding->cred)) { curl_easy_setopt(curl_handle, CURLOPT_HTTPAUTH, CURLAUTH_ANY);

1 0

[commit] r12585 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: anthm Date: Thu Mar 12 11:47:47 2009 New Revision: 12585 Log: FSCORE-331 Modified: freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Thu Mar 12 11:47:47 2009 @@ -463,7 +463,7 @@ } } - if (peer_profile) { + if (peer_profile && !(flags & SOF_FORKED_DIAL)) { if ((cloned_profile = switch_caller_profile_clone(session, peer_profile)) != 0) { switch_channel_set_originatee_caller_profile(channel, cloned_profile); } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Thu Mar 12 11:47:47 2009 @@ -2118,6 +2118,16 @@ } if (*bleg) { + if (caller_channel && !switch_channel_get_originatee_caller_profile(caller_channel)) { + switch_caller_profile_t *cloned_profile, *peer_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(*bleg)); + + if (peer_profile) { + if ((cloned_profile = switch_caller_profile_clone(*bleg, peer_profile)) != 0) { + switch_channel_set_originatee_caller_profile(caller_channel, cloned_profile); + } + } + } + switch_ivr_sleep(*bleg, 0, SWITCH_TRUE, NULL); }

1 0

[commit] r12584 - in freeswitch/trunk/libs/esl: . perl
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: mikej Date: Thu Mar 12 11:10:37 2009 New Revision: 12584 Log: fix gmake on bsd build Modified: freeswitch/trunk/libs/esl/Makefile freeswitch/trunk/libs/esl/perl/Makefile Modified: freeswitch/trunk/libs/esl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/Makefile (original) +++ freeswitch/trunk/libs/esl/Makefile Thu Mar 12 11:10:37 2009 @@ -39,42 +39,42 @@ clean: rm -f *.o src/*.o testclient testserver fs_cli libesl.a *~ src/*~ src/include/*~ - make -C perl clean - make -C php clean - make -C lua clean - make -C python clean - make -C ruby clean + $(MAKE) -C perl clean + $(MAKE) -C php clean + $(MAKE) -C lua clean + $(MAKE) -C python clean + $(MAKE) -C ruby clean reswig: swigclean - make -C perl reswig - make -C php reswig - make -C lua reswig - make -C python reswig - make -C ruby reswig + $(MAKE) -C perl reswig + $(MAKE) -C php reswig + $(MAKE) -C lua reswig + $(MAKE) -C python reswig + $(MAKE) -C ruby reswig swigclean: clean - make -C perl swigclean - make -C php swigclean - make -C lua swigclean - make -C python swigclean - make -C ruby swigclean + $(MAKE) -C perl swigclean + $(MAKE) -C php swigclean + $(MAKE) -C lua swigclean + $(MAKE) -C python swigclean + $(MAKE) -C ruby swigclean perlmod: $(MYLIB) - make MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C perl + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C perl phpmod: $(MYLIB) - make MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C php + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C php luamod: $(MYLIB) - make MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C lua + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C lua pymod: $(MYLIB) - make MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C python rubymod: $(MYLIB) - make MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C ruby + $(MAKE) MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C ruby phpmod-install: phpmod - make -C php install + $(MAKE) -C php install everymod: perlmod phpmod luamod pymod rubymod Modified: freeswitch/trunk/libs/esl/perl/Makefile ============================================================================== --- freeswitch/trunk/libs/esl/perl/Makefile (original) +++ freeswitch/trunk/libs/esl/perl/Makefile Thu Mar 12 11:10:37 2009 @@ -1,7 +1,7 @@ -PERL = $(shell which perl) -PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE -PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') -LOCAL_CFLAGS= -w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL +PERL=$(shell which perl) +PERL_LIBDIR=-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE +PERL_LIBS=$(shell perl -MConfig -e 'print $$Config{libs}') +LOCAL_CFLAGS=-w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') PERL_INC=$(shell $(PERL) -MExtUtils::Embed -e perl_inc) all: ESL.so

1 0

[commit] r12583 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: anthm Date: Thu Mar 12 11:06:31 2009 New Revision: 12583 Log: MODENDP-197 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Thu Mar 12 11:06:31 2009 @@ -1477,7 +1477,6 @@ nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), - TAG_IF(!switch_strlen_zero(sendto), NTATAG_DEFAULT_PROXY(sendto)), TAG_IF(!switch_strlen_zero(tech_pvt->rpid), SIPTAG_REMOTE_PARTY_ID_STR(tech_pvt->rpid)), TAG_IF(!switch_strlen_zero(tech_pvt->preferred_id), SIPTAG_P_PREFERRED_IDENTITY_STR(tech_pvt->preferred_id)), TAG_IF(!switch_strlen_zero(tech_pvt->asserted_id), SIPTAG_P_ASSERTED_IDENTITY_STR(tech_pvt->asserted_id)), @@ -1487,7 +1486,7 @@ TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_IF(route_uri, NUTAG_PROXY(route_uri)), TAG_IF(route, SIPTAG_ROUTE_STR(route)), - TAG_IF(!switch_strlen_zero(sendto), NTATAG_DEFAULT_PROXY(sendto)), + TAG_IF(!switch_strlen_zero(sendto), NUTAG_PROXY(sendto)), SOATAG_ADDRESS(tech_pvt->adv_sdp_audio_ip), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1),

1 0

[commit] r12582 - freeswitch/trunk/src/mod/applications/mod_conference
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: anthm Date: Thu Mar 12 10:09:31 2009 New Revision: 12582 Log: MODAPP-233 (recording members should be invisible to commands Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Thu Mar 12 10:09:31 2009 @@ -2274,7 +2274,7 @@ if (switch_test_flag((&fh), SWITCH_FILE_OPEN)) { switch_core_file_close(&fh); } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording Stopped\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recording of %s Stopped\n", rec->path); if (rec->pool) { switch_memory_pool_t *pool = rec->pool; @@ -2728,7 +2728,9 @@ switch_mutex_lock(conference->member_mutex); for (member = conference->members; member; member = member->next) { - pfncallback(member, stream, data); + if (member->session && !switch_test_flag(member, MFLAG_NOCHANNEL)) { + pfncallback(member, stream, data); + } } switch_mutex_unlock(conference->member_mutex); } @@ -2926,6 +2928,7 @@ switch_mutex_lock(member->control_mutex); switch_clear_flag(member, MFLAG_RUNNING); switch_set_flag_locked(member, MFLAG_KICKED); + switch_core_session_kill_channel(member->session, SWITCH_SIG_BREAK); switch_mutex_unlock(member->control_mutex); if (stream != NULL) { @@ -3907,7 +3910,7 @@ } /* exec functio on last (oldest) member */ - if (last_member != NULL) { + if (last_member != NULL && last_member->session && !switch_test_flag(last_member, MFLAG_NOCHANNEL)) { conf_api_member_cmd_t pfn = (conf_api_member_cmd_t) conf_api_sub_commands[i].pfnapicmd; pfn(last_member, stream, argv[argn + 2]); }

1 0

[commit] r12581 - freeswitch/trunk/src/mod/applications/mod_limit
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: mrene Date: Thu Mar 12 09:59:51 2009 New Revision: 12581 Log: tweak Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Modified: freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c (original) +++ freeswitch/trunk/src/mod/applications/mod_limit/mod_limit.c Thu Mar 12 09:59:51 2009 @@ -322,7 +322,7 @@ switch_safe_free(sql); switch_core_event_hook_remove_state_change(session, db_state_handler); /* Remove limit_realm variable so we register another hook if limit is called again */ - switch_channel_set_variable(channel, "limit_realm", ""); + switch_channel_set_variable(channel, "limit_realm", NULL); } return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r12580 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 12 Mar '09

12 Mar '09

Author: andrew Date: Wed Mar 11 21:37:30 2009 New Revision: 12580 Log: fixin' a segfault Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Wed Mar 11 21:37:30 2009 @@ -950,7 +950,7 @@ } if (!prefs.nodename) { - prefs.nodename = "freeswitch"; + set_pref_nodename("freeswitch"); } return 0;

1 0