- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

12 Mar '09

Author: mrene Date: Wed Mar 11 21:24:24 2009 New Revision: 12579 Log: declinatio mortuus obfirmo Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Mar 11 21:24:24 2009 @@ -2845,7 +2845,7 @@ } } } - + switch_mutex_unlock(mod_sofia_globals.hash_mutex); sofia_glue_restart_all_profiles(); }

1 0

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

12 Mar '09

Author: andrew Date: Wed Mar 11 19:43:07 2009 New Revision: 12578 Log: Add a Makefile.in for mod_erlang_event in preparation for when my configure patch gets merged Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/Makefile.in Added: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/Makefile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/Makefile.in Wed Mar 11 19:43:07 2009 @@ -0,0 +1,9 @@ +LOCAL_SOURCES=handle_msg.c ei_helpers.c +LOCAL_OBJS=handle_msg.o ei_helpers.o +LOCAL_CFLAGS= @ERLANG_CFLAGS@ -D_REENTRANT +LOCAL_LDFLAGS= @ERLANG_LDFLAGS@ + +include ../../../../build/modmake.rules + + +

1 0

[commit] r12577 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by FreeSWITCH SVN 11 Mar '09

11 Mar '09

Author: mikej Date: Wed Mar 11 17:46:46 2009 New Revision: 12577 Log: mod_spidermonkey: fix segfaults on dtmf callback (FSCORE-327) Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Wed Mar 11 17:46:46 2009 @@ -1104,11 +1104,17 @@ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; char var_name[SWITCH_UUID_FORMATTED_LENGTH + 25]; char *p; + switch_status_t status = SWITCH_STATUS_FALSE; - METHOD_SANITY_CHECK(); - - jss->stack_depth++; + if (!jss || !jss->session) { + return SWITCH_STATUS_FALSE; + } + if (++jss->stack_depth > MAX_STACK_DEPTH) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH); + jss->stack_depth--; + return SWITCH_STATUS_FALSE; + } switch_uuid_get(&uuid); switch_uuid_format(uuid_str, &uuid); @@ -1120,6 +1126,9 @@ } } + JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); + METHOD_SANITY_CHECK(); + if (cb_state->jss_a && cb_state->jss_a->session && cb_state->jss_a->session == session) { argv[argc++] = OBJECT_TO_JSVAL(cb_state->session_obj_a); } else if (cb_state->jss_b && cb_state->jss_b->session && cb_state->jss_b->session == session) { @@ -1137,8 +1146,7 @@ } } if (!Event) { - jss->stack_depth--; - return SWITCH_STATUS_FALSE; + goto done; } break; case SWITCH_INPUT_TYPE_DTMF: @@ -1150,8 +1158,7 @@ argv[argc++] = STRING_TO_JSVAL(JS_NewStringCopyZ(cb_state->cx, "dtmf")); argv[argc++] = OBJECT_TO_JSVAL(Event); } else { - jss->stack_depth--; - return SWITCH_STATUS_FALSE; + goto done; } } } @@ -1162,24 +1169,17 @@ argv[argc++] = cb_state->arg; } - if (jss->stack_depth > MAX_STACK_DEPTH) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Maximum recursive callback limit %d reached.\n", MAX_STACK_DEPTH); - jss->stack_depth--; - return SWITCH_STATUS_FALSE; - } - - JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); check_hangup_hook(jss, &ret); - cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); if (ret == JS_TRUE) { - JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); - cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); - jss->stack_depth--; } - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; +done: + cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); + jss->stack_depth--; + return status; } static switch_status_t js_stream_input_callback(switch_core_session_t *session, void *input, switch_input_type_t itype, void *buf, unsigned int buflen)

1 0