- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r10110 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: anthm Date: Wed Oct 22 12:32:55 2008 New Revision: 10110 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: inbound connection to event_socket can now take over an existing channel with 'myevents <uuid>' to take on the behaviour of an outbound socket 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 Wed Oct 22 12:32:55 2008 @@ -743,8 +743,12 @@ } - if (listener->session) { - switch_channel_t *channel = switch_core_session_get_channel(listener->session); + if (listener->session || !strncasecmp(cmd, "myevents ", 9)) { + switch_channel_t *channel = NULL; + + if (listener->session) { + channel = switch_core_session_get_channel(listener->session); + } if (!strncasecmp(cmd, "connect", 7)) { switch_snprintf(reply, reply_len, "+OK"); @@ -777,6 +781,29 @@ switch_snprintf(reply, reply_len, "%s", val); goto done; } else if (!strncasecmp(cmd, "myevents", 8)) { + if (switch_test_flag(listener, LFLAG_MYEVENTS)) { + switch_snprintf(reply, reply_len, "-ERR aready enabled."); + goto done; + } + + if (!listener->session) { + char *uuid; + + if ((uuid = cmd + 9)) { + strip_cr(uuid); + + if (!(listener->session = switch_core_session_locate(uuid))) { + switch_snprintf(reply, reply_len, "-ERR invalid uuid"); + goto done; + } + + switch_set_flag_locked(listener, LFLAG_SESSION); + switch_set_flag_locked(listener, LFLAG_ASYNC); + } + + + } + listener->event_list[SWITCH_EVENT_CHANNEL_CREATE] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_DESTROY] = 1; listener->event_list[SWITCH_EVENT_CHANNEL_STATE] = 1; @@ -1314,10 +1341,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n"); switch_core_hash_destroy(&listener->event_hash); - if (session) { - switch_channel_clear_flag(switch_core_session_get_channel(session), CF_CONTROLLED); + if (listener->session) { + switch_channel_clear_flag(switch_core_session_get_channel(listener->session), CF_CONTROLLED); switch_clear_flag_locked(listener, LFLAG_SESSION); - switch_core_session_rwunlock(session); + switch_core_session_rwunlock(listener->session); } else if (listener->pool) { switch_memory_pool_t *pool = listener->pool; switch_core_destroy_memory_pool(&pool);

1 0

[commit] r10109 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: mikej Date: Wed Oct 22 10:08:24 2008 New Revision: 10109 Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: var scope masking. 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 Wed Oct 22 10:08:24 2008 @@ -1297,13 +1297,13 @@ switch_thread_rwlock_wrlock(listener->rwlock); if (listener->sock) { - char buf[512] = ""; + char disco_buf[512] = ""; const char message[] = "Disconnected, goodbye!\nSee you at ClueCon http://www.cluecon.com!\n"; int mlen = strlen(message); - switch_snprintf(buf, sizeof(buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", mlen); - len = strlen(buf); - switch_socket_send(listener->sock, buf, &len); + switch_snprintf(disco_buf, sizeof(disco_buf), "Content-Type: text/disconnect-notice\nContent-Length %d\n\n", mlen); + len = strlen(disco_buf); + switch_socket_send(listener->sock, disco_buf, &len); len = mlen; switch_socket_send(listener->sock, message, &len); close_socket(&listener->sock);

1 0

[commit] r10108 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: anthm Date: Wed Oct 22 09:14:41 2008 New Revision: 10108 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: missing p Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Wed Oct 22 09:14:41 2008 @@ -1638,7 +1638,7 @@ } if (flag && !strcasecmp(flag, "all")) { - switch_core_session_flush_private_events(session); + switch_core_session_flush_private_events(psession); } switch_channel_set_flag(switch_core_session_get_channel(psession), CF_BREAK);

1 0

[commit] r10107 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: anthm Date: Tue Oct 21 23:13:33 2008 New Revision: 10107 Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Log: reswig 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 Tue Oct 21 23:13:33 2008 @@ -905,6 +905,17 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get() { + char * jresult ; + char *result = 0 ; + + result = (char *) "enable_heartbeat_events"; + + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_get() { char * jresult ; char *result = 0 ; @@ -2169,7 +2180,7 @@ int jresult ; int result; - result = (int) 32; + result = (int) 16; jresult = result; return jresult; @@ -4335,6 +4346,42 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_sched_heartbeat(void * jarg1, unsigned long jarg2) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (uint32_t)jarg2; + switch_core_session_sched_heartbeat(arg1,arg2); +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unsched_heartbeat(void * jarg1) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + switch_core_session_unsched_heartbeat(arg1); +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_enable_heartbeat(void * jarg1, unsigned long jarg2) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + uint32_t arg2 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (uint32_t)jarg2; + switch_core_session_enable_heartbeat(arg1,arg2); +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_disable_heartbeat(void * jarg1) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + switch_core_session_disable_heartbeat(arg1); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_media_bug_add(void * jarg1, void * jarg2, void * jarg3, void * jarg4, unsigned long jarg5, void * jarg6) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; @@ -4981,6 +5028,18 @@ } +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_id(void * jarg1) { + void * jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_size_t result; + + arg1 = (switch_core_session_t *)jarg1; + result = switch_core_session_get_id(arg1); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_id() { void * jresult ; switch_size_t result; @@ -6069,6 +6128,70 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_session_unset_write_codec(void * jarg1) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + switch_core_session_unset_write_codec(arg1); +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_read_impl(void * jarg1, void * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_codec_implementation_t *)jarg2; + result = (switch_status_t)switch_core_session_get_read_impl(arg1,arg2); + jresult = result; + return jresult; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_write_impl(void * jarg1, void * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_codec_implementation_t *)jarg2; + result = (switch_status_t)switch_core_session_get_write_impl(arg1,arg2); + jresult = result; + return jresult; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_video_read_impl(void * jarg1, void * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_codec_implementation_t *)jarg2; + result = (switch_status_t)switch_core_session_get_video_read_impl(arg1,arg2); + jresult = result; + return jresult; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_get_video_write_impl(void * jarg1, void * jarg2) { + int jresult ; + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_codec_implementation_t *arg2 = (switch_codec_implementation_t *) 0 ; + switch_status_t result; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_codec_implementation_t *)jarg2; + result = (switch_status_t)switch_core_session_get_video_write_impl(arg1,arg2); + jresult = result; + return jresult; +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_core_session_get_read_codec(void * jarg1) { void * jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; @@ -14651,93 +14774,93 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_frame_set(void * jarg1, int jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_packet_set(void * jarg1, int jarg2) { switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; int arg2 ; arg1 = (switch_codec_implementation *)jarg1; arg2 = (int)jarg2; - if (arg1) (arg1)->microseconds_per_frame = arg2; + if (arg1) (arg1)->microseconds_per_packet = arg2; } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_frame_get(void * jarg1) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_microseconds_per_packet_get(void * jarg1) { int jresult ; switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; int result; arg1 = (switch_codec_implementation *)jarg1; - result = (int) ((arg1)->microseconds_per_frame); + result = (int) ((arg1)->microseconds_per_packet); jresult = result; return jresult; } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_frame_set(void * jarg1, unsigned long jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packet_set(void * jarg1, unsigned long jarg2) { switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; uint32_t arg2 ; arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; - if (arg1) (arg1)->samples_per_frame = arg2; + if (arg1) (arg1)->samples_per_packet = arg2; } -SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_frame_get(void * jarg1) { +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_samples_per_packet_get(void * jarg1) { unsigned long jresult ; switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; uint32_t result; arg1 = (switch_codec_implementation *)jarg1; - result = (uint32_t) ((arg1)->samples_per_frame); + result = (uint32_t) ((arg1)->samples_per_packet); jresult = (unsigned long)result; return jresult; } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_bytes_per_frame_set(void * jarg1, unsigned long jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per_packet_set(void * jarg1, unsigned long jarg2) { switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; uint32_t arg2 ; arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; - if (arg1) (arg1)->bytes_per_frame = arg2; + if (arg1) (arg1)->decoded_bytes_per_packet = arg2; } -SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_bytes_per_frame_get(void * jarg1) { +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_decoded_bytes_per_packet_get(void * jarg1) { unsigned long jresult ; switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; uint32_t result; arg1 = (switch_codec_implementation *)jarg1; - result = (uint32_t) ((arg1)->bytes_per_frame); + result = (uint32_t) ((arg1)->decoded_bytes_per_packet); jresult = (unsigned long)result; return jresult; } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_frame_set(void * jarg1, unsigned long jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_packet_set(void * jarg1, unsigned long jarg2) { switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; uint32_t arg2 ; arg1 = (switch_codec_implementation *)jarg1; arg2 = (uint32_t)jarg2; - if (arg1) (arg1)->encoded_bytes_per_frame = arg2; + if (arg1) (arg1)->encoded_bytes_per_packet = arg2; } -SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_frame_get(void * jarg1) { +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_codec_implementation_encoded_bytes_per_packet_get(void * jarg1) { unsigned long jresult ; switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; uint32_t result; arg1 = (switch_codec_implementation *)jarg1; - result = (uint32_t) ((arg1)->encoded_bytes_per_frame); + result = (uint32_t) ((arg1)->encoded_bytes_per_packet); jresult = (unsigned long)result; return jresult; } @@ -14766,47 +14889,24 @@ } -SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_pref_frames_per_packet_set(void * jarg1, int jarg2) { - switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; - int arg2 ; - - arg1 = (switch_codec_implementation *)jarg1; - arg2 = (int)jarg2; - if (arg1) (arg1)->pref_frames_per_packet = arg2; - -} - - -SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_pref_frames_per_packet_get(void * jarg1) { - int jresult ; - switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; - int result; - - arg1 = (switch_codec_implementation *)jarg1; - result = (int) ((arg1)->pref_frames_per_packet); - jresult = result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_max_frames_per_packet_set(void * jarg1, int jarg2) { +SWIGEXPORT void SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_packet_set(void * jarg1, int jarg2) { switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; int arg2 ; arg1 = (switch_codec_implementation *)jarg1; arg2 = (int)jarg2; - if (arg1) (arg1)->max_frames_per_packet = arg2; + if (arg1) (arg1)->codec_frames_per_packet = arg2; } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_max_frames_per_packet_get(void * jarg1) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_codec_implementation_codec_frames_per_packet_get(void * jarg1) { int jresult ; switch_codec_implementation *arg1 = (switch_codec_implementation *) 0 ; int result; arg1 = (switch_codec_implementation *)jarg1; - result = (int) ((arg1)->max_frames_per_packet); + result = (int) ((arg1)->codec_frames_per_packet); 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 Tue Oct 21 23:13:33 2008 @@ -847,6 +847,22 @@ return ret; } + public static void switch_core_session_sched_heartbeat(SWIGTYPE_p_switch_core_session session, uint seconds) { + freeswitchPINVOKE.switch_core_session_sched_heartbeat(SWIGTYPE_p_switch_core_session.getCPtr(session), seconds); + } + + public static void switch_core_session_unsched_heartbeat(SWIGTYPE_p_switch_core_session session) { + freeswitchPINVOKE.switch_core_session_unsched_heartbeat(SWIGTYPE_p_switch_core_session.getCPtr(session)); + } + + public static void switch_core_session_enable_heartbeat(SWIGTYPE_p_switch_core_session session, uint seconds) { + freeswitchPINVOKE.switch_core_session_enable_heartbeat(SWIGTYPE_p_switch_core_session.getCPtr(session), seconds); + } + + public static void switch_core_session_disable_heartbeat(SWIGTYPE_p_switch_core_session session) { + freeswitchPINVOKE.switch_core_session_disable_heartbeat(SWIGTYPE_p_switch_core_session.getCPtr(session)); + } + public static switch_status_t switch_core_media_bug_add(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__switch_bool_t callback, SWIGTYPE_p_void user_data, SWIGTYPE_p_time_t stop_time, uint flags, SWIGTYPE_p_p_switch_media_bug new_bug) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_media_bug_add(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_f_p_switch_media_bug_p_void_enum_switch_abc_type_t__switch_bool_t.getCPtr(callback), SWIGTYPE_p_void.getCPtr(user_data), SWIGTYPE_p_time_t.getCPtr(stop_time), flags, SWIGTYPE_p_p_switch_media_bug.getCPtr(new_bug)); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); @@ -1082,6 +1098,11 @@ return ret; } + public static SWIGTYPE_p_switch_size_t switch_core_session_get_id(SWIGTYPE_p_switch_core_session session) { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_core_session_get_id(SWIGTYPE_p_switch_core_session.getCPtr(session)), true); + return ret; + } + public static SWIGTYPE_p_switch_size_t switch_core_session_id() { SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_core_session_id(), true); return ret; @@ -1465,6 +1486,30 @@ freeswitchPINVOKE.switch_core_session_unset_read_codec(SWIGTYPE_p_switch_core_session.getCPtr(session)); } + public static void switch_core_session_unset_write_codec(SWIGTYPE_p_switch_core_session session) { + freeswitchPINVOKE.switch_core_session_unset_write_codec(SWIGTYPE_p_switch_core_session.getCPtr(session)); + } + + public static switch_status_t switch_core_session_get_read_impl(SWIGTYPE_p_switch_core_session session, switch_codec_implementation impp) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_read_impl(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_codec_implementation.getCPtr(impp)); + return ret; + } + + public static switch_status_t switch_core_session_get_write_impl(SWIGTYPE_p_switch_core_session session, switch_codec_implementation impp) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_write_impl(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_codec_implementation.getCPtr(impp)); + return ret; + } + + public static switch_status_t switch_core_session_get_video_read_impl(SWIGTYPE_p_switch_core_session session, switch_codec_implementation impp) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_video_read_impl(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_codec_implementation.getCPtr(impp)); + return ret; + } + + public static switch_status_t switch_core_session_get_video_write_impl(SWIGTYPE_p_switch_core_session session, switch_codec_implementation impp) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_get_video_write_impl(SWIGTYPE_p_switch_core_session.getCPtr(session), switch_codec_implementation.getCPtr(impp)); + return ret; + } + public static switch_codec switch_core_session_get_read_codec(SWIGTYPE_p_switch_core_session session) { IntPtr cPtr = freeswitchPINVOKE.switch_core_session_get_read_codec(SWIGTYPE_p_switch_core_session.getCPtr(session)); switch_codec ret = (cPtr == IntPtr.Zero) ? null : new switch_codec(cPtr, false); @@ -3824,6 +3869,7 @@ public static readonly int SWITCH_MAX_DTMF_DURATION = freeswitchPINVOKE.SWITCH_MAX_DTMF_DURATION_get(); public static readonly string SWITCH_PATH_SEPARATOR = freeswitchPINVOKE.SWITCH_PATH_SEPARATOR_get(); public static readonly string SWITCH_URL_SEPARATOR = freeswitchPINVOKE.SWITCH_URL_SEPARATOR_get(); + public static readonly string SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE = freeswitchPINVOKE.SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get(); public static readonly string SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_get(); public static readonly string SWITCH_READ_RESULT_VARIABLE = freeswitchPINVOKE.SWITCH_READ_RESULT_VARIABLE_get(); public static readonly string SWITCH_COPY_XML_CDR_VARIABLE = freeswitchPINVOKE.SWITCH_COPY_XML_CDR_VARIABLE_get(); @@ -4289,6 +4335,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_URL_SEPARATOR_get")] public static extern string SWITCH_URL_SEPARATOR_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get")] + public static extern string SWITCH_ENABLE_HEARTBEAT_EVENTS_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_get")] public static extern string SWITCH_BYPASS_MEDIA_AFTER_BRIDGE_VARIABLE_get(); @@ -5147,6 +5196,18 @@ [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_core_thread_session")] public static extern void delete_switch_core_thread_session(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_sched_heartbeat")] + public static extern void switch_core_session_sched_heartbeat(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_unsched_heartbeat")] + public static extern void switch_core_session_unsched_heartbeat(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_enable_heartbeat")] + public static extern void switch_core_session_enable_heartbeat(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_disable_heartbeat")] + public static extern void switch_core_session_disable_heartbeat(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_media_bug_add")] public static extern int switch_core_media_bug_add(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4, uint jarg5, HandleRef jarg6); @@ -5285,6 +5346,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_count")] public static extern uint switch_core_session_count(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_id")] + public static extern IntPtr switch_core_session_get_id(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_id")] public static extern IntPtr switch_core_session_id(); @@ -5516,6 +5580,21 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_unset_read_codec")] public static extern void switch_core_session_unset_read_codec(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_unset_write_codec")] + public static extern void switch_core_session_unset_write_codec(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_read_impl")] + public static extern int switch_core_session_get_read_impl(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_write_impl")] + public static extern int switch_core_session_get_write_impl(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_video_read_impl")] + public static extern int switch_core_session_get_video_read_impl(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_video_write_impl")] + public static extern int switch_core_session_get_video_write_impl(HandleRef jarg1, HandleRef jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_get_read_codec")] public static extern IntPtr switch_core_session_get_read_codec(HandleRef jarg1); @@ -7598,29 +7677,29 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_bits_per_second_get")] public static extern int switch_codec_implementation_bits_per_second_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_microseconds_per_frame_set")] - public static extern void switch_codec_implementation_microseconds_per_frame_set(HandleRef jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_microseconds_per_packet_set")] + public static extern void switch_codec_implementation_microseconds_per_packet_set(HandleRef jarg1, int jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_microseconds_per_frame_get")] - public static extern int switch_codec_implementation_microseconds_per_frame_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_microseconds_per_packet_get")] + public static extern int switch_codec_implementation_microseconds_per_packet_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_samples_per_frame_set")] - public static extern void switch_codec_implementation_samples_per_frame_set(HandleRef jarg1, uint jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_samples_per_packet_set")] + public static extern void switch_codec_implementation_samples_per_packet_set(HandleRef jarg1, uint jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_samples_per_frame_get")] - public static extern uint switch_codec_implementation_samples_per_frame_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_samples_per_packet_get")] + public static extern uint switch_codec_implementation_samples_per_packet_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_bytes_per_frame_set")] - public static extern void switch_codec_implementation_bytes_per_frame_set(HandleRef jarg1, uint jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_decoded_bytes_per_packet_set")] + public static extern void switch_codec_implementation_decoded_bytes_per_packet_set(HandleRef jarg1, uint jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_bytes_per_frame_get")] - public static extern uint switch_codec_implementation_bytes_per_frame_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_decoded_bytes_per_packet_get")] + public static extern uint switch_codec_implementation_decoded_bytes_per_packet_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_encoded_bytes_per_frame_set")] - public static extern void switch_codec_implementation_encoded_bytes_per_frame_set(HandleRef jarg1, uint jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_encoded_bytes_per_packet_set")] + public static extern void switch_codec_implementation_encoded_bytes_per_packet_set(HandleRef jarg1, uint jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_encoded_bytes_per_frame_get")] - public static extern uint switch_codec_implementation_encoded_bytes_per_frame_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_encoded_bytes_per_packet_get")] + public static extern uint switch_codec_implementation_encoded_bytes_per_packet_get(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_number_of_channels_set")] public static extern void switch_codec_implementation_number_of_channels_set(HandleRef jarg1, byte jarg2); @@ -7628,17 +7707,11 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_number_of_channels_get")] public static extern byte switch_codec_implementation_number_of_channels_get(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_pref_frames_per_packet_set")] - public static extern void switch_codec_implementation_pref_frames_per_packet_set(HandleRef jarg1, int jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_pref_frames_per_packet_get")] - public static extern int switch_codec_implementation_pref_frames_per_packet_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_codec_frames_per_packet_set")] + public static extern void switch_codec_implementation_codec_frames_per_packet_set(HandleRef jarg1, int jarg2); - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_max_frames_per_packet_set")] - public static extern void switch_codec_implementation_max_frames_per_packet_set(HandleRef jarg1, int jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_max_frames_per_packet_get")] - public static extern int switch_codec_implementation_max_frames_per_packet_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_codec_frames_per_packet_get")] + public static extern int switch_codec_implementation_codec_frames_per_packet_get(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_codec_implementation_init_set")] public static extern void switch_codec_implementation_init_set(HandleRef jarg1, HandleRef jarg2); @@ -15559,7 +15632,8 @@ SWITCH_CAUSE_USER_CHALLENGE = 603, SWITCH_CAUSE_MEDIA_TIMEOUT = 604, SWITCH_CAUSE_PICKED_OFF = 605, - SWITCH_CAUSE_USER_NOT_REGISTERED = 606 + SWITCH_CAUSE_USER_NOT_REGISTERED = 606, + SWITCH_CAUSE_PROGRESS_TIMEOUT = 607 } } @@ -16713,42 +16787,42 @@ } } - public int microseconds_per_frame { + public int microseconds_per_packet { set { - freeswitchPINVOKE.switch_codec_implementation_microseconds_per_frame_set(swigCPtr, value); + freeswitchPINVOKE.switch_codec_implementation_microseconds_per_packet_set(swigCPtr, value); } get { - int ret = freeswitchPINVOKE.switch_codec_implementation_microseconds_per_frame_get(swigCPtr); + int ret = freeswitchPINVOKE.switch_codec_implementation_microseconds_per_packet_get(swigCPtr); return ret; } } - public uint samples_per_frame { + public uint samples_per_packet { set { - freeswitchPINVOKE.switch_codec_implementation_samples_per_frame_set(swigCPtr, value); + freeswitchPINVOKE.switch_codec_implementation_samples_per_packet_set(swigCPtr, value); } get { - uint ret = freeswitchPINVOKE.switch_codec_implementation_samples_per_frame_get(swigCPtr); + uint ret = freeswitchPINVOKE.switch_codec_implementation_samples_per_packet_get(swigCPtr); return ret; } } - public uint bytes_per_frame { + public uint decoded_bytes_per_packet { set { - freeswitchPINVOKE.switch_codec_implementation_bytes_per_frame_set(swigCPtr, value); + freeswitchPINVOKE.switch_codec_implementation_decoded_bytes_per_packet_set(swigCPtr, value); } get { - uint ret = freeswitchPINVOKE.switch_codec_implementation_bytes_per_frame_get(swigCPtr); + uint ret = freeswitchPINVOKE.switch_codec_implementation_decoded_bytes_per_packet_get(swigCPtr); return ret; } } - public uint encoded_bytes_per_frame { + public uint encoded_bytes_per_packet { set { - freeswitchPINVOKE.switch_codec_implementation_encoded_bytes_per_frame_set(swigCPtr, value); + freeswitchPINVOKE.switch_codec_implementation_encoded_bytes_per_packet_set(swigCPtr, value); } get { - uint ret = freeswitchPINVOKE.switch_codec_implementation_encoded_bytes_per_frame_get(swigCPtr); + uint ret = freeswitchPINVOKE.switch_codec_implementation_encoded_bytes_per_packet_get(swigCPtr); return ret; } } @@ -16763,22 +16837,12 @@ } } - public int pref_frames_per_packet { - set { - freeswitchPINVOKE.switch_codec_implementation_pref_frames_per_packet_set(swigCPtr, value); - } - get { - int ret = freeswitchPINVOKE.switch_codec_implementation_pref_frames_per_packet_get(swigCPtr); - return ret; - } - } - - public int max_frames_per_packet { + public int codec_frames_per_packet { set { - freeswitchPINVOKE.switch_codec_implementation_max_frames_per_packet_set(swigCPtr, value); + freeswitchPINVOKE.switch_codec_implementation_codec_frames_per_packet_set(swigCPtr, value); } get { - int ret = freeswitchPINVOKE.switch_codec_implementation_max_frames_per_packet_get(swigCPtr); + int ret = freeswitchPINVOKE.switch_codec_implementation_codec_frames_per_packet_get(swigCPtr); return ret; } } @@ -18789,6 +18853,7 @@ SWITCH_EVENT_CHANNEL_DATA, SWITCH_EVENT_GENERAL, SWITCH_EVENT_COMMAND, + SWITCH_EVENT_SESSION_HEARTBEAT, SWITCH_EVENT_ALL } @@ -22058,7 +22123,9 @@ SCSC_MAX_DTMF_DURATION, SCSC_DEFAULT_DTMF_DURATION, SCSC_SHUTDOWN_ELEGANT, - SCSC_CANCEL_SHUTDOWN + SCSC_SHUTDOWN_ASAP, + SCSC_CANCEL_SHUTDOWN, + SCSC_SEND_SIGHUP } }

1 0

[commit] r10106 - freeswitch/trunk/src
by Freeswitch SVN 22 Oct '08

22 Oct '08

Author: mikej Date: Tue Oct 21 23:03:43 2008 New Revision: 10106 Modified: freeswitch/trunk/src/switch_core_session.c Log: don't deref null. Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Oct 21 23:03:43 2008 @@ -790,11 +790,12 @@ switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); switch_channel_event_set_data(session->channel, event); switch_event_fire(&event); + + /* reschedule this task */ + task->runtime = switch_timestamp(NULL) + session->track_duration; + switch_core_session_rwunlock(session); } - - /* reschedule this task */ - task->runtime = switch_timestamp(NULL) + session->track_duration; } SWITCH_DECLARE(void) switch_core_session_unsched_heartbeat(switch_core_session_t *session)

1 0

[commit] r10105 - freeswitch/trunk/src/include
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 19:05:53 2008 New Revision: 10105 Modified: freeswitch/trunk/src/include/switch_module_interfaces.h Log: clean up comments 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 Tue Oct 21 19:05:53 2008 @@ -562,17 +562,17 @@ uint32_t actual_samples_per_second; /*! bits transferred per second */ int bits_per_second; - /*! number of microseconds that denote one frame */ + /*! number of microseconds of media in one packet (ptime * 1000) */ int microseconds_per_packet; - /*! number of samples that denote one frame */ + /*! number of samples in one packet */ uint32_t samples_per_packet; - /*! number of bytes that denote one frame decompressed */ + /*! number of bytes one packet will decompress to */ uint32_t decoded_bytes_per_packet; - /*! number of bytes that denote one frame compressed */ + /*! number of encoded bytes in the RTP payload */ uint32_t encoded_bytes_per_packet; /*! number of channels represented */ uint8_t number_of_channels; - /*! number of codec frames to send in one netowrk packet */ + /*! number of codec frames packetized into one packet */ int codec_frames_per_packet; /*! function to initialize a codec handle using this implementation */ switch_core_codec_init_func_t init;

1 0

[commit] r10103 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 18:40:20 2008 New Revision: 10103 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: Add optional <variables> and <params> tag to <gateway> tag. current gateways are: <gateway> <param name="foo" value="bar"/> </gateway> now can also be: <gateway> <params> <param name="foo" value="bar"/> </params> </gateway> now can also be: <gateway> <params> <param name="foo" value="bar"/> </params> <variables> <variable name="myvar" val="myval"/> </variables> </gateway> any variables will be set on all outgoing channels using that gateway. 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 Tue Oct 21 18:40:20 2008 @@ -2029,6 +2029,16 @@ } else { tech_pvt->invite_contact = switch_core_session_strdup(nsession, gateway_ptr->register_contact); } + + if (gateway_ptr->vars) { + switch_event_header_t *hp; + for(hp = gateway_ptr->vars->headers; hp; hp = hp->next) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n", + switch_channel_get_name(nchannel), hp->name, hp->value); + switch_channel_set_variable(nchannel, hp->name, hp->value); + } + } + } else { if (!(dest = strchr(profile_name, '/'))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n"); 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 Tue Oct 21 18:40:20 2008 @@ -297,6 +297,7 @@ reg_state_t state; switch_memory_pool_t *pool; int deleted; + switch_event_t *vars; struct sofia_gateway *next; }; 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 Tue Oct 21 18:40:20 2008 @@ -93,6 +93,9 @@ switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_from); switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_contact); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deleted gateway %s\n", gateway_ptr->name); + if (gateway_ptr->vars) { + switch_event_destroy(&gateway_ptr->vars); + } } else { last = gateway_ptr; }

1 0

[commit] r10102 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: anthm Date: Tue Oct 21 16:01:52 2008 New Revision: 10102 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_presence.c Log: alternate fix for MODENDP-144 that does not break eyebeam/x-lite 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 Tue Oct 21 16:01:52 2008 @@ -791,6 +791,13 @@ { if (switch_stristr("polycom", user_agent)) { *ct = "application/xpidf+xml"; + + /* of course!, lets make a big deal over dashes. Now the stupidity is complete. */ + + if (!strcmp(prpid, "on-the-phone")) { + prpid = "onthephone"; + } + return switch_mprintf( "<?xml version=\"1.0\"?>\n" "<!DOCTYPE presence PUBLIC \"-//IETF//DTD RFCxxxx XPIDF 1.0//EN\" \"xpidf.dtd\">\n"

1 0

[commit] r10101 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: mikej Date: Tue Oct 21 16:01:48 2008 New Revision: 10101 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: MODENDP-133 (add parsing of another header for privacy info) 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 Tue Oct 21 16:01:48 2008 @@ -3334,6 +3334,7 @@ sip_remote_party_id_t *rpid = NULL; sip_p_asserted_identity_t *passerted = NULL; sip_p_preferred_identity_t *ppreferred = NULL; + sip_privacy_t *privacy = NULL; sip_alert_info_t *alert_info = NULL; private_object_t *tech_pvt = NULL; switch_channel_t *channel = NULL; @@ -3836,6 +3837,12 @@ } } + if ((privacy = sip_privacy(sip))) { + if(msg_params_find(privacy->priv_values, "id")) { + switch_set_flag(tech_pvt->caller_profile, SWITCH_CPF_HIDE_NAME | SWITCH_CPF_HIDE_NUMBER); + } + } + /* Loop thru unknown Headers Here so we can do something with them */ for (un = sip->sip_unknown; un; un = un->un_next) { if (!strncasecmp(un->un_name, "Diversion", 9)) {

1 0

[commit] r10100 - freeswitch/trunk/src/mod/languages/mod_lua/lua
by Freeswitch SVN 21 Oct '08

21 Oct '08

Author: mikej Date: Tue Oct 21 15:39:57 2008 New Revision: 10100 Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c Log: MODLANG-87 - Update to lua 5.1.4 release Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lapi.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lapi.c,v 2.55.1.3 2008/01/03 15:20:39 roberto Exp $ +** $Id: lapi.c,v 2.55.1.5 2008/07/04 18:41:18 roberto Exp $ ** Lua API ** See Copyright Notice in lua.h */ @@ -93,15 +93,14 @@ LUA_API int lua_checkstack (lua_State *L, int size) { - int res; + int res = 1; lua_lock(L); - if ((L->top - L->base + size) > LUAI_MAXCSTACK) + if (size > LUAI_MAXCSTACK || (L->top - L->base + size) > LUAI_MAXCSTACK) res = 0; /* stack overflow */ - else { + else if (size > 0) { luaD_checkstack(L, size); if (L->ci->top < L->top + size) L->ci->top = L->top + size; - res = 1; } lua_unlock(L); return res; @@ -930,10 +929,13 @@ g->GCthreshold = g->totalbytes - a; else g->GCthreshold = 0; - while (g->GCthreshold <= g->totalbytes) + while (g->GCthreshold <= g->totalbytes) { luaC_step(L); - if (g->gcstate == GCSpause) /* end of cycle? */ - res = 1; /* signal it */ + if (g->gcstate == GCSpause) { /* end of cycle? */ + res = 1; /* signal it */ + break; + } + } break; } case LUA_GCSETPAUSE: { Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lbaselib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lbaselib.c,v 1.191.1.4 2008/01/20 13:53:22 roberto Exp $ +** $Id: lbaselib.c,v 1.191.1.6 2008/02/14 16:46:22 roberto Exp $ ** Basic library ** See Copyright Notice in lua.h */ @@ -344,10 +344,12 @@ luaL_checktype(L, 1, LUA_TTABLE); i = luaL_optint(L, 2, 1); e = luaL_opt(L, luaL_checkint, 3, luaL_getn(L, 1)); + if (i > e) return 0; /* empty range */ n = e - i + 1; /* number of elements */ - if (n <= 0) return 0; /* empty range */ - luaL_checkstack(L, n, "table too big to unpack"); - for (; i<=e; i++) /* push arg[i...e] */ + if (n <= 0 || !lua_checkstack(L, n)) /* n <= 0 means arith. overflow */ + return luaL_error(L, "too many results to unpack"); + lua_rawgeti(L, 1, i); /* push arg[i] (avoiding overflow problems) */ + while (i++ < e) /* push arg[i + 1...e] */ lua_rawgeti(L, 1, i); return n; } @@ -526,7 +528,7 @@ status = lua_resume(co, narg); if (status == 0 || status == LUA_YIELD) { int nres = lua_gettop(co); - if (!lua_checkstack(L, nres)) + if (!lua_checkstack(L, nres + 1)) luaL_error(L, "too many results to resume"); lua_xmove(co, L, nres); /* move yielded values */ return nres; Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/ldebug.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: ldebug.c,v 2.29.1.3 2007/12/28 15:32:23 roberto Exp $ +** $Id: ldebug.c,v 2.29.1.6 2008/05/08 16:56:26 roberto Exp $ ** Debug Interface ** See Copyright Notice in lua.h */ @@ -275,12 +275,12 @@ static int precheck (const Proto *pt) { check(pt->maxstacksize <= MAXSTACK); - lua_assert(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize); - lua_assert(!(pt->is_vararg & VARARG_NEEDSARG) || + check(pt->numparams+(pt->is_vararg & VARARG_HASARG) <= pt->maxstacksize); + check(!(pt->is_vararg & VARARG_NEEDSARG) || (pt->is_vararg & VARARG_HASARG)); check(pt->sizeupvalues <= pt->nups); check(pt->sizelineinfo == pt->sizecode || pt->sizelineinfo == 0); - check(GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN); + check(pt->sizecode > 0 && GET_OPCODE(pt->code[pt->sizecode-1]) == OP_RETURN); return 1; } @@ -346,9 +346,18 @@ int dest = pc+1+b; check(0 <= dest && dest < pt->sizecode); if (dest > 0) { - /* cannot jump to a setlist count */ - Instruction d = pt->code[dest-1]; - check(!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)); + int j; + /* check that it does not jump to a setlist count; this + is tricky, because the count from a previous setlist may + have the same value of an invalid setlist; so, we must + go all the way back to the first of them (if any) */ + for (j = 0; j < dest; j++) { + Instruction d = pt->code[dest-1-j]; + if (!(GET_OPCODE(d) == OP_SETLIST && GETARG_C(d) == 0)) break; + } + /* if 'j' is even, previous value is not a setlist (even if + it looks like one) */ + check((j&1) == 0); } } break; @@ -363,7 +372,11 @@ } switch (op) { case OP_LOADBOOL: { - check(c == 0 || pc+2 < pt->sizecode); /* check its jump */ + if (c == 1) { /* does it jump? */ + check(pc+2 < pt->sizecode); /* check its jump */ + check(GET_OPCODE(pt->code[pc+1]) != OP_SETLIST || + GETARG_C(pt->code[pc+1]) != 0); + } break; } case OP_LOADNIL: { @@ -428,7 +441,10 @@ } case OP_SETLIST: { if (b > 0) checkreg(pt, a + b); - if (c == 0) pc++; + if (c == 0) { + pc++; + check(pc < pt->sizecode - 1); + } break; } case OP_CLOSURE: { Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/loadlib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: loadlib.c,v 1.52.1.2 2007/12/28 14:58:43 roberto Exp $ +** $Id: loadlib.c,v 1.52.1.3 2008/08/06 13:29:28 roberto Exp $ ** Dynamic library loader for Lua ** See Copyright Notice in lua.h ** @@ -506,8 +506,10 @@ static void setfenv (lua_State *L) { lua_Debug ar; - lua_getstack(L, 1, &ar); - lua_getinfo(L, "f", &ar); + if (lua_getstack(L, 1, &ar) == 0 || + lua_getinfo(L, "f", &ar) == 0 || /* get calling function */ + lua_iscfunction(L, -1)) + luaL_error(L, LUA_QL("module") " not called from a Lua function"); lua_pushvalue(L, -2); lua_setfenv(L, -2); lua_pop(L, 1); Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lobject.h Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lobject.h,v 2.20.1.1 2007/12/27 13:02:25 roberto Exp $ +** $Id: lobject.h,v 2.20.1.2 2008/08/06 13:29:48 roberto Exp $ ** Type definitions for Lua objects ** See Copyright Notice in lua.h */ @@ -208,7 +208,7 @@ #define getstr(ts) cast(const char *, (ts) + 1) -#define svalue(o) getstr(tsvalue(o)) +#define svalue(o) getstr(rawtsvalue(o)) Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lstrlib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lstrlib.c,v 1.132.1.3 2007/12/28 15:32:23 roberto Exp $ +** $Id: lstrlib.c,v 1.132.1.4 2008/07/11 17:27:21 roberto Exp $ ** Standard library for string operations and pattern-matching ** See Copyright Notice in lua.h */ @@ -35,7 +35,8 @@ static ptrdiff_t posrelat (ptrdiff_t pos, size_t len) { /* relative string position: negative means back from end */ - return (pos>=0) ? pos : (ptrdiff_t)len+pos+1; + if (pos < 0) pos += (ptrdiff_t)len + 1; + return (pos >= 0) ? pos : 0; } Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/ltablib.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: ltablib.c,v 1.38.1.2 2007/12/28 15:32:23 roberto Exp $ +** $Id: ltablib.c,v 1.38.1.3 2008/02/14 16:46:58 roberto Exp $ ** Library for Table Manipulation ** See Copyright Notice in lua.h */ @@ -132,6 +132,15 @@ } +static void addfield (lua_State *L, luaL_Buffer *b, int i) { + lua_rawgeti(L, 1, i); + if (!lua_isstring(L, -1)) + luaL_error(L, "invalid value (%s) at index %d in table for " + LUA_QL("concat"), luaL_typename(L, -1), i); + luaL_addvalue(b); +} + + static int tconcat (lua_State *L) { luaL_Buffer b; size_t lsep; @@ -141,13 +150,12 @@ i = luaL_optint(L, 3, 1); last = luaL_opt(L, luaL_checkint, 4, luaL_getn(L, 1)); luaL_buffinit(L, &b); - for (; i <= last; i++) { - lua_rawgeti(L, 1, i); - luaL_argcheck(L, lua_isstring(L, -1), 1, "table contains non-strings"); - luaL_addvalue(&b); - if (i != last) - luaL_addlstring(&b, sep, lsep); + for (; i < last; i++) { + addfield(L, &b, i); + luaL_addlstring(&b, sep, lsep); } + if (i == last) /* add last value (if interval was not empty) */ + addfield(L, &b, i); luaL_pushresult(&b); return 1; } Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lua.h Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lua.h,v 1.218.1.4 2008/01/03 15:41:15 roberto Exp $ +** $Id: lua.h,v 1.218.1.5 2008/08/06 13:30:12 roberto Exp $ ** Lua - An Extensible Extension Language ** Lua.org, PUC-Rio, Brazil (http://www.lua.org) ** See Copyright Notice at the end of this file @@ -17,7 +17,7 @@ #define LUA_VERSION "Lua 5.1" -#define LUA_RELEASE "Lua 5.1.3" +#define LUA_RELEASE "Lua 5.1.4" #define LUA_VERSION_NUM 501 #define LUA_COPYRIGHT "Copyright (C) 1994-2008 Lua.org, PUC-Rio" #define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo & W. Celes" Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/luaconf.h Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: luaconf.h,v 1.82.1.6 2008/01/18 17:07:48 roberto Exp $ +** $Id: luaconf.h,v 1.82.1.7 2008/02/11 16:25:08 roberto Exp $ ** Configuration file for Lua ** See Copyright Notice in lua.h */ @@ -91,7 +91,7 @@ ".\\?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?\\init.lua;" \ LUA_CDIR"?.lua;" LUA_CDIR"?\\init.lua" #define LUA_CPATH_DEFAULT \ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" + ".\\?.dll;" ".\\?51.dll;" LUA_CDIR"?.dll;" LUA_CDIR"?51.dll;" LUA_CDIR"clibs\\?.dll;" LUA_CDIR"clibs\\?51.dll;" LUA_CDIR"loadall.dll;" LUA_CDIR"clibs\\loadall.dll" #else #define LUA_ROOT "/usr/local/" @@ -101,7 +101,7 @@ "./?.lua;" LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua" #define LUA_CPATH_DEFAULT \ - "./?.so;" LUA_CDIR"?.so;" LUA_CDIR"loadall.so" + "./?.so;" "./lib?51.so;" LUA_CDIR"?.so;" LUA_CDIR"lib?51.so;" LUA_CDIR"loadall.so" #endif @@ -440,10 +440,10 @@ @* can use. ** CHANGE it if you need lots of (Lua) stack space for your C ** functions. This limit is arbitrary; its only purpose is to stop C -** functions to consume unlimited stack space. +** functions to consume unlimited stack space. (must be smaller than +** -LUA_REGISTRYINDEX) */ -#define LUAI_MCS_AUX ((int)(INT_MAX / (4*sizeof(LUA_NUMBER)))) -#define LUAI_MAXCSTACK (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX) +#define LUAI_MAXCSTACK 8000 Modified: freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/lua/lundump.c Tue Oct 21 15:39:57 2008 @@ -1,5 +1,5 @@ /* -** $Id: lundump.c,v 2.7.1.2 2008/01/18 16:39:11 roberto Exp $ +** $Id: lundump.c,v 2.7.1.4 2008/04/04 19:51:41 roberto Exp $ ** load precompiled Lua chunks ** See Copyright Notice in lua.h */ @@ -48,7 +48,6 @@ static void LoadBlock(LoadState* S, void* b, size_t size) { size_t r=luaZ_read(S->Z,b,size); - UNUSED(r); IF (r!=0, "unexpected end"); } @@ -115,7 +114,7 @@ setnilvalue(o); break; case LUA_TBOOLEAN: - setbvalue(o,LoadChar(S)); + setbvalue(o,LoadChar(S)!=0); break; case LUA_TNUMBER: setnvalue(o,LoadNumber(S)); @@ -161,7 +160,9 @@ static Proto* LoadFunction(LoadState* S, TString* p) { - Proto* f=luaF_newproto(S->L); + Proto* f; + if (++S->L->nCcalls > LUAI_MAXCCALLS) error(S,"code too deep"); + f=luaF_newproto(S->L); setptvalue2s(S->L,S->L->top,f); incr_top(S->L); f->source=LoadString(S); if (f->source==NULL) f->source=p; f->linedefined=LoadInt(S); @@ -175,6 +176,7 @@ LoadDebug(S,f); IF (!luaG_checkcode(f), "bad code"); S->L->top--; + S->L->nCcalls--; return f; }

1 0