November 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10398 - freeswitch/trunk/src
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Fri Nov 14 09:20:10 2008 New Revision: 10398 Log: finish fixing MODAPP-166 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Fri Nov 14 09:20:10 2008 @@ -1393,6 +1393,12 @@ switch_assert(session); + if (max_digits < min_digits) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, + "Max digits %u is less than Min %u, forcing Max to %u\n", max_digits, min_digits, min_digits); + max_digits = min_digits; + } + channel = switch_core_session_get_channel(session); switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, NULL); @@ -1408,7 +1414,9 @@ args.buflen = (uint32_t) digit_buffer_length; if (!switch_strlen_zero(prompt_audio_file) && strcasecmp(prompt_audio_file, "silence")) { - status = switch_ivr_play_file(session, NULL, prompt_audio_file, &args); + if ((status = switch_ivr_play_file(session, NULL, prompt_audio_file, &args)) == SWITCH_STATUS_BREAK) { + status = SWITCH_STATUS_SUCCESS; + } } if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { @@ -1417,7 +1425,6 @@ len = strlen(digit_buffer); - if ((min_digits && len < min_digits) || len < max_digits) { args.buf = digit_buffer + len; args.buflen = (uint32_t) (digit_buffer_length - len); @@ -1429,16 +1436,20 @@ status = SWITCH_STATUS_TOO_SMALL; } - if (status == SWITCH_STATUS_SUCCESS) { + switch (status) { + case SWITCH_STATUS_SUCCESS: switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, "success"); - } else if (status == SWITCH_STATUS_TIMEOUT) { + break; + case SWITCH_STATUS_TIMEOUT: switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, "timeout"); - } else { + break; + default: switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, "failure"); + break; + } - - - end: + + end: if (var_name && !switch_strlen_zero(digit_buffer)) { switch_channel_set_variable(channel, var_name, digit_buffer); @@ -1469,13 +1480,12 @@ switch_channel_flush_dtmf(channel); status = switch_ivr_read(session, min_digits, max_digits, prompt_audio_file, NULL, digit_buffer, digit_buffer_length, timeout, valid_terminators); - if (status == SWITCH_STATUS_TIMEOUT && strlen(digit_buffer) >= min_digits) { status = SWITCH_STATUS_SUCCESS; } if (status == SWITCH_STATUS_SUCCESS) { - if (!switch_strlen_zero((char *)digit_buffer)) { + if (!switch_strlen_zero(digit_buffer)) { if (switch_strlen_zero(digits_regex)) { return SWITCH_STATUS_SUCCESS; } @@ -1493,6 +1503,7 @@ max_tries--; } + memset(digit_buffer, 0, digit_buffer_length); return SWITCH_STATUS_FALSE; }

1 0

[commit] r10397 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Thu Nov 13 22:41:17 2008 New Revision: 10397 Log: update 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 Nov 13 22:41:17 2008 @@ -1089,6 +1089,7 @@ const char *priv = "off"; const char *screen = "no"; const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); + const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri"); if (switch_strlen_zero(tech_pvt->dest)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error!\n"); @@ -1103,7 +1104,13 @@ url_str = url; - if (!switch_strlen_zero(tech_pvt->gateway_from_str)) { + if (from_var) { + if (strncasecmp(from_var, "sip:", 4) || strncasecmp(from_var, "sips:", 5)) { + use_from_str = switch_core_session_strdup(tech_pvt->session, from_var); + } else { + use_from_str = switch_core_session_sprintf(tech_pvt->session, "sip:%s", from_var); + } + } else if (!switch_strlen_zero(tech_pvt->gateway_from_str)) { use_from_str = tech_pvt->gateway_from_str; } else { use_from_str = tech_pvt->from_str;

1 0

[commit] r10396 - freeswitch/trunk/src/include
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Thu Nov 13 22:01:08 2008 New Revision: 10396 Log: wrong week to quit sniffing glue Modified: freeswitch/trunk/src/include/switch_xml.h Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Nov 13 22:01:08 2008 @@ -355,7 +355,7 @@ ///\note gateway functions will be executed in the order they were binded until a success is found else the root registry will be used SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function_ret(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data, switch_xml_binding_t **ret); -#define switch_xml_bind_search_function(_f, _s, _u) switch_xml_bind_search_function_ret(_u, _s, _u, NULL) +#define switch_xml_bind_search_function(_f, _s, _u) switch_xml_bind_search_function_ret(_f, _s, _u, NULL) SWITCH_DECLARE(switch_status_t) switch_xml_unbind_search_function(switch_xml_binding_t **binding);

1 0

[commit] r10395 - in freeswitch/trunk/src: . include mod/languages/mod_managed mod/languages/mod_managed/managed
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Thu Nov 13 21:59:00 2008 New Revision: 10395 Log: tweak Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs freeswitch/trunk/src/switch_ivr_play_say.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Nov 13 21:59:00 2008 @@ -355,7 +355,7 @@ uint32_t timeout, char *valid_terminators, char *audio_file, - char *bad_input_audio_file, void *digit_buffer, uint32_t digit_buffer_length, + char *bad_input_audio_file, char *digit_buffer, uint32_t digit_buffer_length, char *digits_regex); SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session, 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 Thu Nov 13 21:59:00 2008 @@ -20047,7 +20047,7 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_play_and_get_digits(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, void * jarg9, unsigned long jarg10, char * jarg11) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_play_and_get_digits(void * jarg1, unsigned long jarg2, unsigned long jarg3, unsigned long jarg4, unsigned long jarg5, char * jarg6, char * jarg7, char * jarg8, char * jarg9, unsigned long jarg10, char * jarg11) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; uint32_t arg2 ; @@ -20057,7 +20057,7 @@ char *arg6 = (char *) 0 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; - void *arg9 = (void *) 0 ; + char *arg9 = (char *) 0 ; uint32_t arg10 ; char *arg11 = (char *) 0 ; switch_status_t result; @@ -20070,7 +20070,7 @@ arg6 = (char *)jarg6; arg7 = (char *)jarg7; arg8 = (char *)jarg8; - arg9 = (void *)jarg9; + arg9 = (char *)jarg9; arg10 = (uint32_t)jarg10; arg11 = (char *)jarg11; result = (switch_status_t)switch_play_and_get_digits(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11); @@ -22888,17 +22888,19 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_bind_search_function(void * jarg1, unsigned long jarg2, void * jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_xml_bind_search_function_ret(void * jarg1, unsigned long jarg2, void * jarg3, void * jarg4) { int jresult ; switch_xml_search_function_t arg1 = (switch_xml_search_function_t) 0 ; switch_xml_section_t arg2 ; void *arg3 = (void *) 0 ; + switch_xml_binding_t **arg4 = (switch_xml_binding_t **) 0 ; switch_status_t result; arg1 = (switch_xml_search_function_t)jarg1; arg2 = (switch_xml_section_t)jarg2; arg3 = (void *)jarg3; - result = (switch_status_t)switch_xml_bind_search_function(arg1,arg2,arg3); + arg4 = (switch_xml_binding_t **)jarg4; + result = (switch_status_t)switch_xml_bind_search_function_ret(arg1,arg2,arg3,arg4); jresult = result; return jresult; } 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 Thu Nov 13 21:59:00 2008 @@ -2938,8 +2938,8 @@ return ret; } - public static switch_status_t switch_play_and_get_digits(SWIGTYPE_p_switch_core_session session, uint min_digits, uint max_digits, uint max_tries, uint timeout, string valid_terminators, string audio_file, string bad_input_audio_file, SWIGTYPE_p_void digit_buffer, uint digit_buffer_length, string digits_regex) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_play_and_get_digits(SWIGTYPE_p_switch_core_session.getCPtr(session), min_digits, max_digits, max_tries, timeout, valid_terminators, audio_file, bad_input_audio_file, SWIGTYPE_p_void.getCPtr(digit_buffer), digit_buffer_length, digits_regex); + public static switch_status_t switch_play_and_get_digits(SWIGTYPE_p_switch_core_session session, uint min_digits, uint max_digits, uint max_tries, uint timeout, string valid_terminators, string audio_file, string bad_input_audio_file, string digit_buffer, uint digit_buffer_length, string digits_regex) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_play_and_get_digits(SWIGTYPE_p_switch_core_session.getCPtr(session), min_digits, max_digits, max_tries, timeout, valid_terminators, audio_file, bad_input_audio_file, digit_buffer, digit_buffer_length, digits_regex); return ret; } @@ -3632,8 +3632,8 @@ return ret; } - public static switch_status_t switch_xml_bind_search_function(SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_switch_event_t_p_void__p_switch_xml function, uint sections, SWIGTYPE_p_void user_data) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_xml_bind_search_function(SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_switch_event_t_p_void__p_switch_xml.getCPtr(function), sections, SWIGTYPE_p_void.getCPtr(user_data)); + public static switch_status_t switch_xml_bind_search_function_ret(SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_switch_event_t_p_void__p_switch_xml function, uint sections, SWIGTYPE_p_void user_data, SWIGTYPE_p_p_switch_xml_binding ret) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_xml_bind_search_function_ret(SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_q_const__char_p_q_const__char_p_switch_event_t_p_void__p_switch_xml.getCPtr(function), sections, SWIGTYPE_p_void.getCPtr(user_data), SWIGTYPE_p_p_switch_xml_binding.getCPtr(ret)); return ret; } @@ -8911,7 +8911,7 @@ public static extern int switch_ivr_record_file(HandleRef jarg1, HandleRef jarg2, string jarg3, HandleRef jarg4, uint jarg5); [DllImport("mod_managed", EntryPoint="CSharp_switch_play_and_get_digits")] - public static extern int switch_play_and_get_digits(HandleRef jarg1, uint jarg2, uint jarg3, uint jarg4, uint jarg5, string jarg6, string jarg7, string jarg8, HandleRef jarg9, uint jarg10, string jarg11); + public static extern int switch_play_and_get_digits(HandleRef jarg1, uint jarg2, uint jarg3, uint jarg4, uint jarg5, string jarg6, string jarg7, string jarg8, string jarg9, uint jarg10, string jarg11); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_speak_text_handle")] public static extern int switch_ivr_speak_text_handle(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4, string jarg5, HandleRef jarg6); @@ -9501,8 +9501,8 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_open_cfg")] public static extern IntPtr switch_xml_open_cfg(string jarg1, HandleRef jarg2, HandleRef jarg3); - [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_bind_search_function")] - public static extern int switch_xml_bind_search_function(HandleRef jarg1, uint jarg2, HandleRef jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_bind_search_function_ret")] + public static extern int switch_xml_bind_search_function_ret(HandleRef jarg1, uint jarg2, HandleRef jarg3, HandleRef jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_xml_unbind_search_function")] public static extern int switch_xml_unbind_search_function(HandleRef jarg1); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Nov 13 21:59:00 2008 @@ -1456,7 +1456,7 @@ char *valid_terminators, char *prompt_audio_file, char *bad_input_audio_file, - void *digit_buffer, + char *digit_buffer, uint32_t digit_buffer_length, char *digits_regex) { @@ -1469,6 +1469,11 @@ switch_channel_flush_dtmf(channel); status = switch_ivr_read(session, min_digits, max_digits, prompt_audio_file, NULL, digit_buffer, digit_buffer_length, timeout, valid_terminators); + + if (status == SWITCH_STATUS_TIMEOUT && strlen(digit_buffer) >= min_digits) { + status = SWITCH_STATUS_SUCCESS; + } + if (status == SWITCH_STATUS_SUCCESS) { if (!switch_strlen_zero((char *)digit_buffer)) { if (switch_strlen_zero(digits_regex)) {

1 0

[commit] r10394 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Thu Nov 13 21:46:28 2008 New Revision: 10394 Log: doh Modified: freeswitch/trunk/src/include/switch_xml.h freeswitch/trunk/src/switch_xml.c Modified: freeswitch/trunk/src/include/switch_xml.h ============================================================================== --- freeswitch/trunk/src/include/switch_xml.h (original) +++ freeswitch/trunk/src/include/switch_xml.h Thu Nov 13 21:46:28 2008 @@ -353,7 +353,10 @@ ///\param user_data a pointer to private data to be used during the callback ///\return SWITCH_STATUS_SUCCESS if successful ///\note gateway functions will be executed in the order they were binded until a success is found else the root registry will be used -SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data); + +SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function_ret(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data, switch_xml_binding_t **ret); +#define switch_xml_bind_search_function(_f, _s, _u) switch_xml_bind_search_function_ret(_u, _s, _u, NULL) + SWITCH_DECLARE(switch_status_t) switch_xml_unbind_search_function(switch_xml_binding_t **binding); SWITCH_DECLARE(switch_status_t) switch_xml_unbind_search_function_ptr(switch_xml_search_function_t function); Modified: freeswitch/trunk/src/switch_xml.c ============================================================================== --- freeswitch/trunk/src/switch_xml.c (original) +++ freeswitch/trunk/src/switch_xml.c Thu Nov 13 21:46:28 2008 @@ -228,7 +228,7 @@ return status; } -SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data) +SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function_ret(switch_xml_search_function_t function, switch_xml_section_t sections, void *user_data, switch_xml_binding_t **ret) { switch_xml_binding_t *binding = NULL, *ptr = NULL; assert(function != NULL); @@ -249,6 +249,11 @@ } else { BINDINGS = binding; } + + if (ret) { + *ret = binding; + } + switch_thread_rwlock_unlock(B_RWLOCK); return SWITCH_STATUS_SUCCESS;

1 0

[commit] r10393 - in freeswitch/trunk/src/mod: applications/mod_dptools dialplans/mod_dialplan_asterisk
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: brian Date: Thu Nov 13 20:00:02 2008 New Revision: 10393 Log: unprotect these interfaces when done Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.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 Thu Nov 13 20:00:02 2008 @@ -1956,6 +1956,8 @@ cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; } + UNPROTECT_INTERFACE(error_endpoint_interface); + return cause; } @@ -2116,6 +2118,8 @@ done: + UNPROTECT_INTERFACE(user_endpoint_interface); + if (xml) { switch_xml_free(xml); } Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c ============================================================================== --- freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c (original) +++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_asterisk/mod_dialplan_asterisk.c Thu Nov 13 20:00:02 2008 @@ -318,6 +318,9 @@ } outbound_profile->destination_number = switch_core_sprintf(outbound_profile->pool, "%s/%s", profile, outbound_profile->destination_number); + + UNPROTECT_INTERFACE(sip_endpoint_interface); + return switch_core_session_outgoing_channel(session, var_event, "sofia", outbound_profile, new_session, pool, SOF_NONE); } @@ -337,6 +340,8 @@ switch_caller_profile_t *outbound_profile, switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) { + UNPROTECT_INTERFACE(iax2_endpoint_interface); + return switch_core_session_outgoing_channel(session, var_event, "iax", outbound_profile, new_session, pool, SOF_NONE); }

1 0

[commit] r10392 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 14 Nov '08

14 Nov '08

Author: anthm Date: Thu Nov 13 19:20:22 2008 New Revision: 10392 Log: update 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 Thu Nov 13 19:20:22 2008 @@ -1757,7 +1757,7 @@ char *contact; if (!switch_strlen_zero(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1)) ) { - cb->stream->write_function(cb->stream, "%ssofia/%s/%s,", argv[2], argv[1], sofia_glue_strip_proto(contact)); + cb->stream->write_function(cb->stream, "%ssofia/%s/sip:%s,", argv[2], argv[1], sofia_glue_strip_proto(contact)); free(contact); } @@ -2555,6 +2555,7 @@ } } + switch_yield(1000000); su_deinit(); switch_mutex_lock(mod_sofia_globals.hash_mutex);

1 0

[commit] r10391 - in freeswitch/trunk/src: . mod/endpoints/mod_sofia
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: anthm Date: Thu Nov 13 18:25:38 2008 New Revision: 10391 Log: It's time to play the music, It's time to light the lights Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_ivr.c 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 Thu Nov 13 18:25:38 2008 @@ -2986,6 +2986,7 @@ switch_clear_flag_locked(b_tech_pvt, TFLAG_SIP_HOLD); switch_clear_flag_locked(tech_pvt, TFLAG_HOLD_LOCK); + switch_channel_set_variable(switch_core_session_get_channel(b_session), "park_timeout", "2"); switch_channel_set_state(switch_core_session_get_channel(b_session), CS_PARK); new_b_session = switch_core_session_locate(br_b); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Nov 13 18:25:38 2008 @@ -494,6 +494,9 @@ switch_codec_t *read_codec; uint32_t rate; uint32_t bpf; + const char *to; + int timeout = 0; + time_t expires = 0; if (switch_channel_test_flag(channel, CF_CONTROLLED)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that are under control already.\n"); @@ -522,6 +525,14 @@ rate = read_codec->implementation->actual_samples_per_second; bpf = read_codec->implementation->decoded_bytes_per_packet; + if ((to = switch_channel_get_variable(channel, "park_timeout"))) { + if ((timeout = atoi(to)) < 0) { + timeout = 0; + } else { + expires = switch_timestamp(NULL) + timeout; + } + } + switch_channel_set_flag(channel, CF_CONTROLLED); if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PARK) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(channel, event); @@ -535,6 +546,11 @@ break; } + if (expires && switch_timestamp(NULL) >= expires) { + switch_channel_hangup(channel, SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE); + break; + } + if (switch_channel_test_flag(channel, CF_UNICAST)) { if (!conninfo) { if (!(conninfo = switch_channel_get_private(channel, "unicast"))) {

1 0

[commit] r10390 - in freeswitch/trunk/src: . include mod/endpoints/mod_sofia
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: anthm Date: Thu Nov 13 18:07:03 2008 New Revision: 10390 Log: fix codec issue Modified: freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_loadable_module.c 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 Thu Nov 13 18:07:03 2008 @@ -633,8 +633,8 @@ struct switch_api_interface *next; }; -#define PROTECT_INTERFACE(_it) if (!_it->refs) {switch_thread_rwlock_rdlock(_it->parent->rwlock); switch_thread_rwlock_rdlock(_it->rwlock); _it->refs++; _it->parent->refs++;} -#define UNPROTECT_INTERFACE(_it) if (_it->refs) {switch_thread_rwlock_unlock(_it->rwlock); switch_thread_rwlock_unlock(_it->parent->rwlock); _it->refs--; _it->parent->refs--; _it = NULL;} +#define PROTECT_INTERFACE(_it) if (_it && !_it->refs) {switch_thread_rwlock_rdlock(_it->parent->rwlock); switch_thread_rwlock_rdlock(_it->rwlock); _it->refs++; _it->parent->refs++;} //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "+++++++++++LOCK\n"); +#define UNPROTECT_INTERFACE(_it) if (_it && _it->refs) {switch_thread_rwlock_unlock(_it->rwlock); switch_thread_rwlock_unlock(_it->parent->rwlock); _it->refs--; _it->parent->refs--; _it = NULL;} //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "-----------UNLOCK\n"); SWITCH_END_EXTERN_C #endif 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 Thu Nov 13 18:07:03 2008 @@ -373,6 +373,17 @@ switch_safe_free(stream.data); } + if (tech_pvt->read_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->read_codec); + } + + if (tech_pvt->write_codec.implementation) { + switch_core_codec_destroy(&tech_pvt->write_codec); + } + + switch_core_session_unset_read_codec(session); + switch_core_session_unset_write_codec(session); + switch_mutex_lock(tech_pvt->profile->flag_mutex); switch_clear_flag(tech_pvt, TFLAG_IO); tech_pvt->profile->inuse--; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Nov 13 18:07:03 2008 @@ -1479,9 +1479,12 @@ found: + UNPROTECT_INTERFACE(codec_interface); + if (i > arraylen) { break; } + } }

1 0

[commit] r10389 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 13 Nov '08

13 Nov '08

Author: andrew Date: Thu Nov 13 17:46:58 2008 New Revision: 10389 Log: Add support for 'getpid'; a way to return the fake cnode process id on the FreeSWITCH side 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 Thu Nov 13 17:46:58 2008 @@ -63,7 +63,7 @@ struct listener { int sockfd; - const struct ei_cnode_s *ec; + struct ei_cnode_s *ec; erlang_pid log_pid; erlang_pid event_pid; switch_queue_t *event_queue; @@ -884,6 +884,10 @@ switch_clear_flag_locked(listener, LFLAG_RUNNING); ei_x_encode_atom(rbuf, "ok"); goto event_done; + } else if (!strncmp(atom, "getpid", MAXATOMLEN)) { + ei_x_encode_tuple_header(rbuf, 2); + ei_x_encode_atom(rbuf, "ok"); + ei_x_encode_pid(rbuf, ei_self(listener->ec)); } else { ei_x_encode_tuple_header(rbuf, 2); ei_x_encode_atom(rbuf, "error"); @@ -1007,7 +1011,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_unlink\n"); break; case ERL_EXIT : - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "erl_exit from %s <%d.%d.%d>\n", msg.from.node, msg.from.creation, msg.from.num, msg.from.serial); + /* TODO - check if this linked pid is any of the log/event handler processes and cleanup if it is. */ break; default : switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "unexpected msg type %d\n", (int)(msg.msgtype));

1 0