November 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10221 - freeswitch/trunk/src
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: anthm Date: Mon Nov 3 11:38:32 2008 New Revision: 10221 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Log: fix FSCORE-216 declinatio mortuus obfirmo Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Mon Nov 3 11:38:32 2008 @@ -30,6 +30,7 @@ */ #include <switch.h> +#define DEFAULT_LEAD_FRAMES 50 static const switch_state_handler_table_t audio_bridge_peer_state_handlers; @@ -84,6 +85,7 @@ switch_input_callback_function_t input_callback; void *session_data; int clean_exit; + uint32_t skip_frames; }; typedef struct switch_ivr_bridge_data switch_ivr_bridge_data_t; @@ -216,7 +218,7 @@ goto end_of_bridge_loop; } - if (loop_count > 50 && switch_core_session_private_event_count(session_a)) { + if (loop_count > DEFAULT_LEAD_FRAMES && switch_core_session_private_event_count(session_a)) { switch_channel_set_flag(chan_b, CF_SUSPEND); msg.string_arg = data->b_uuid; msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE; @@ -246,7 +248,7 @@ } #endif - if (loop_count > 50 && bypass_media_after_bridge) { + if (loop_count > DEFAULT_LEAD_FRAMES && bypass_media_after_bridge) { switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE); bypass_media_after_bridge = 0; } @@ -341,6 +343,11 @@ } } + if (data->skip_frames) { + data->skip_frames--; + continue; + } + if (status != SWITCH_STATUS_BREAK && !switch_channel_test_flag(chan_a, CF_HOLD)) { if (switch_core_session_write_frame(session_b, read_frame, SWITCH_IO_FLAG_NONE, stream_id) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, @@ -862,13 +869,33 @@ switch_channel_set_variable(peer_channel, SWITCH_SIGNAL_BOND_VARIABLE, switch_core_session_get_uuid(session)); if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_app"))) { + switch_event_t *event; + data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_aleg_data"); - switch_core_session_execute_application(session, app, data); + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); + switch_core_session_queue_private_event(session, &event); + a_leg->skip_frames = DEFAULT_LEAD_FRAMES; + } + } if ((app = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_app"))) { + switch_event_t *event; data = switch_channel_get_variable(caller_channel, "bridge_pre_execute_bleg_data"); - switch_core_session_execute_application(peer_session, app, data); + if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) { + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true"); + switch_core_session_queue_private_event(peer_session, &event); + b_leg->skip_frames = DEFAULT_LEAD_FRAMES; + } } switch_channel_set_private(peer_channel, "_bridge_", b_leg);

1 0

[commit] r10220 - freeswitch/trunk/src
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: anthm Date: Mon Nov 3 10:45:38 2008 New Revision: 10220 Modified: freeswitch/trunk/src/switch_channel.c Log: fix FSCORE-215 Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Nov 3 10:45:38 2008 @@ -2093,7 +2093,7 @@ switch_status_t status; switch_mutex_lock(channel->profile_mutex); status = switch_event_dup(event, channel->variables); - switch_mutex_lock(channel->profile_mutex); + switch_mutex_unlock(channel->profile_mutex); return status; }

1 0

[commit] r10219 - freeswitch/trunk/src/mod/languages/mod_managed
by Freeswitch SVN 03 Nov '08

03 Nov '08

Author: michaelgg Date: Mon Nov 3 01:39:32 2008 New Revision: 10219 Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj Log: Ignore warning 4505 in release too Modified: freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/mod_managed.vcproj Mon Nov 3 01:39:32 2008 @@ -135,6 +135,7 @@ UsePrecompiledHeader="0" WarningLevel="4" DebugInformationFormat="3" + DisableSpecificWarnings="4505" /> <Tool Name="VCManagedResourceCompilerTool" @@ -294,6 +295,7 @@ UsePrecompiledHeader="0" WarningLevel="3" DebugInformationFormat="3" + DisableSpecificWarnings="4505" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r10218 - in freeswitch/trunk/src/mod: endpoints/mod_sofia event_handlers/mod_event_socket
by Freeswitch SVN 02 Nov '08

02 Nov '08

Author: stkn Date: Sun Nov 2 15:14:12 2008 New Revision: 10218 Modified: 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: Add quotation marks to clarify acl messages + indentation cleanup 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 Sun Nov 2 15:14:12 2008 @@ -3436,17 +3436,17 @@ acl_token = strdup(token); } if ((profile->pflags & PFLAG_AUTH_CALLS)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Approved by acl %s[%s]. Access Granted.\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Approved by acl \"%s[%s]\". Access Granted.\n", network_ip, switch_str_nil(last_acl), switch_str_nil(acl_token)); is_auth = 1; } } else { if (!(profile->pflags & PFLAG_AUTH_CALLS)) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, switch_str_nil(last_acl)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", network_ip, switch_str_nil(last_acl)); nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); return; } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Rejected by acl %s. Falling back to Digest auth.\n", + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IP %s Rejected by acl \"%s\". Falling back to Digest auth.\n", network_ip, switch_str_nil(last_acl)); } } 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 Sun Nov 2 15:14:12 2008 @@ -1022,8 +1022,8 @@ if (ok && !(profile->pflags & PFLAG_BLIND_REG)) { type = REG_AUTO_REGISTER; } else if (!ok) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); - nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", network_ip, profile->reg_acl[x]); + nua_respond(nh, SIP_403_FORBIDDEN, NUTAG_WITH_THIS(nua), TAG_END()); goto end; } } 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 Sun Nov 2 15:14:12 2008 @@ -1604,7 +1604,7 @@ const char message[] = "Access Denied, go away.\n"; int mlen = strlen(message); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", listener->remote_ip, prefs.acl[x]); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", listener->remote_ip, prefs.acl[x]); switch_snprintf(buf, sizeof(buf), "Content-Type: text/rude-rejection\nContent-Length %d\n\n", mlen); len = strlen(buf);

1 0

[commit] r10217 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 02 Nov '08

02 Nov '08

Author: anthm Date: Sat Nov 1 22:10:01 2008 New Revision: 10217 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: swigall 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 Sat Nov 1 22:10:01 2008 @@ -7100,19 +7100,49 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_strftime_tz(char * jarg1, char * jarg2, char * jarg3, unsigned long jarg4) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_strftime_tz(char * jarg1, char * jarg2, char * jarg3, unsigned long jarg4, void * jarg5) { int jresult ; char *arg1 = (char *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; size_t arg4 ; + switch_time_t arg5 ; switch_status_t result; + switch_time_t *argp5 ; arg1 = (char *)jarg1; arg2 = (char *)jarg2; arg3 = (char *)jarg3; arg4 = (size_t)jarg4; - result = (switch_status_t)switch_strftime_tz((char const *)arg1,(char const *)arg2,arg3,arg4); + argp5 = (switch_time_t *)jarg5; + if (!argp5) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0); + return 0; + } + arg5 = *argp5; + result = (switch_status_t)switch_strftime_tz((char const *)arg1,(char const *)arg2,arg3,arg4,arg5); + jresult = result; + return jresult; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_time_exp_tz_name(char * jarg1, void * jarg2, void * jarg3) { + int jresult ; + char *arg1 = (char *) 0 ; + switch_time_exp_t *arg2 = (switch_time_exp_t *) 0 ; + switch_time_t arg3 ; + switch_status_t result; + switch_time_t *argp3 ; + + arg1 = (char *)jarg1; + arg2 = (switch_time_exp_t *)jarg2; + argp3 = (switch_time_t *)jarg3; + if (!argp3) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_time_t", 0); + return 0; + } + arg3 = *argp3; + result = (switch_status_t)switch_time_exp_tz_name((char const *)arg1,arg2,arg3); 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 Sat Nov 1 22:10:01 2008 @@ -1849,8 +1849,15 @@ return ret; } - public static switch_status_t switch_strftime_tz(string tz, string format, string date, uint len) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_strftime_tz(tz, format, date, len); + public static switch_status_t switch_strftime_tz(string tz, string format, string date, uint len, SWIGTYPE_p_switch_time_t thetime) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_strftime_tz(tz, format, date, len, SWIGTYPE_p_switch_time_t.getCPtr(thetime)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + public static switch_status_t switch_time_exp_tz_name(string tz, SWIGTYPE_p_switch_time_exp_t tm, SWIGTYPE_p_switch_time_t thetime) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_time_exp_tz_name(tz, SWIGTYPE_p_switch_time_exp_t.getCPtr(tm), SWIGTYPE_p_switch_time_t.getCPtr(thetime)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -5793,7 +5800,10 @@ public static extern IntPtr switch_timestamp(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_strftime_tz")] - public static extern int switch_strftime_tz(string jarg1, string jarg2, string jarg3, uint jarg4); + public static extern int switch_strftime_tz(string jarg1, string jarg2, string jarg3, uint jarg4, HandleRef jarg5); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_time_exp_tz_name")] + public static extern int switch_time_exp_tz_name(string jarg1, HandleRef jarg2, HandleRef jarg3); [DllImport("mod_managed", EntryPoint="CSharp_switch_load_network_lists")] public static extern void switch_load_network_lists(int jarg1); @@ -14240,6 +14250,36 @@ using System; using System.Runtime.InteropServices; +public class SWIGTYPE_p_switch_time_exp_t { + private HandleRef swigCPtr; + + internal SWIGTYPE_p_switch_time_exp_t(IntPtr cPtr, bool futureUse) { + swigCPtr = new HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_switch_time_exp_t() { + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + + internal static HandleRef getCPtr(SWIGTYPE_p_switch_time_exp_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org) + * Version 1.3.35 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + public class SWIGTYPE_p_switch_time_t { private HandleRef swigCPtr;

1 0

[commit] r10216 - freeswitch/trunk/src
by Freeswitch SVN 01 Nov '08

01 Nov '08

Author: anthm Date: Sat Nov 1 12:18:04 2008 New Revision: 10216 Modified: freeswitch/trunk/src/switch_core_rwlock.c freeswitch/trunk/src/switch_core_session.c Log: move logic down a step Modified: freeswitch/trunk/src/switch_core_rwlock.c ============================================================================== --- freeswitch/trunk/src/switch_core_rwlock.c (original) +++ freeswitch/trunk/src/switch_core_rwlock.c Sat Nov 1 12:18:04 2008 @@ -45,7 +45,7 @@ switch_status_t status = SWITCH_STATUS_FALSE; if (session->rwlock) { - if (switch_test_flag(session, SSF_DESTROYED)) { + if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_get_state(session->channel) >= CS_HANGUP) { status = SWITCH_STATUS_FALSE; #ifdef SWITCH_DEBUG_RWLOCKS switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n", Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Sat Nov 1 12:18:04 2008 @@ -57,11 +57,9 @@ if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) { /* Acquire a read lock on the session */ #ifdef SWITCH_DEBUG_RWLOCKS - if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || - switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { + if (switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) { #else - if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_test_flag(session, SSF_DESTROYED) || - switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { + if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { #endif /* not available, forget it */ session = NULL;

1 0