- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11284 - freeswitch/trunk/src/mod/formats/mod_shout
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: mikej Date: Mon Jan 19 11:27:42 2009 New Revision: 11284 Log: use consistent var types. Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Modified: freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/mod_shout.c Mon Jan 19 11:27:42 2009 @@ -911,7 +911,7 @@ shout_context_t *context; int rlen = 0; int16_t *audio = data; - int nsamples = *len; + size_t nsamples = *len; if (!handle) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error no handle\n"); @@ -965,7 +965,7 @@ } if (handle->channels == 2) { - int i, j = 0; + switch_size_t i, j = 0; if (context->llen < nsamples) { context->l = switch_core_alloc(context->memory_pool, nsamples * 2);

1 0

[commit] r11283 - freeswitch/trunk/src/mod/event_handlers/mod_event_socket
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: mikej Date: Mon Jan 19 11:12:07 2009 New Revision: 11283 Log: fix windows build Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 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 Mon Jan 19 11:12:07 2009 @@ -1163,8 +1163,6 @@ switch_set_flag_locked(listener, LFLAG_HANDLE_DISCO); if (switch_test_flag(listener, LFLAG_LINGER)) { char message[128] = ""; - int mlen; - switch_size_t len; char disco_buf[512] = ""; switch_snprintf(message, sizeof(message), @@ -1175,7 +1173,7 @@ "Controlled-Session-UUID: %s\n" "Content-Disposition: linger\n" "Content-Length: %d\n\n", - switch_core_session_get_uuid(listener->session), mlen); + switch_core_session_get_uuid(listener->session), (int)mlen); len = strlen(disco_buf); switch_socket_send(listener->sock, disco_buf, &len);

1 0

[commit] r11282 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: mikej Date: Mon Jan 19 11:06:29 2009 New Revision: 11282 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 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 Mon Jan 19 11:06:29 2009 @@ -20953,7 +20953,7 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_tone_detect_session(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, int jarg6, char * jarg7, char * jarg8) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_ivr_tone_detect_session(void * jarg1, char * jarg2, char * jarg3, char * jarg4, void * jarg5, int jarg6, char * jarg7, char * jarg8, void * jarg9) { int jresult ; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; char *arg2 = (char *) 0 ; @@ -20963,6 +20963,7 @@ int arg6 ; char *arg7 = (char *) 0 ; char *arg8 = (char *) 0 ; + switch_tone_detect_callback_t arg9 = (switch_tone_detect_callback_t) 0 ; switch_status_t result; time_t *argp5 ; @@ -20979,7 +20980,8 @@ arg6 = (int)jarg6; arg7 = (char *)jarg7; arg8 = (char *)jarg8; - result = (switch_status_t)switch_ivr_tone_detect_session(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,(char const *)arg8); + arg9 = (switch_tone_detect_callback_t)jarg9; + result = (switch_status_t)switch_ivr_tone_detect_session(arg1,(char const *)arg2,(char const *)arg3,(char const *)arg4,arg5,arg6,(char const *)arg7,(char const *)arg8,arg9); 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 Mon Jan 19 11:06:29 2009 @@ -3032,8 +3032,8 @@ return ret; } - public static switch_status_t switch_ivr_tone_detect_session(SWIGTYPE_p_switch_core_session session, string key, string tone_spec, string flags, SWIGTYPE_p_time_t timeout, int hits, string app, string data) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_tone_detect_session(SWIGTYPE_p_switch_core_session.getCPtr(session), key, tone_spec, flags, SWIGTYPE_p_time_t.getCPtr(timeout), hits, app, data); + public static switch_status_t switch_ivr_tone_detect_session(SWIGTYPE_p_switch_core_session session, string key, string tone_spec, string flags, SWIGTYPE_p_time_t timeout, int hits, string app, string data, SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char__switch_bool_t callback) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_tone_detect_session(SWIGTYPE_p_switch_core_session.getCPtr(session), key, tone_spec, flags, SWIGTYPE_p_time_t.getCPtr(timeout), hits, app, data, SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char__switch_bool_t.getCPtr(callback)); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -9334,7 +9334,7 @@ public static extern int switch_ivr_stop_tone_detect_session(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_tone_detect_session")] - public static extern int switch_ivr_tone_detect_session(HandleRef jarg1, string jarg2, string jarg3, string jarg4, HandleRef jarg5, int jarg6, string jarg7, string jarg8); + public static extern int switch_ivr_tone_detect_session(HandleRef jarg1, string jarg2, string jarg3, string jarg4, HandleRef jarg5, int jarg6, string jarg7, string jarg8, HandleRef jarg9); [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_play_file")] public static extern int switch_ivr_play_file(HandleRef jarg1, HandleRef jarg2, string jarg3, HandleRef jarg4); @@ -11856,6 +11856,36 @@ using System; using System.Runtime.InteropServices; +public class SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char__switch_bool_t { + private HandleRef swigCPtr; + + internal SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char__switch_bool_t(IntPtr cPtr, bool futureUse) { + swigCPtr = new HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char__switch_bool_t() { + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + + internal static HandleRef getCPtr(SWIGTYPE_p_f_p_switch_core_session_p_q_const__char_p_q_const__char__switch_bool_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_f_p_switch_core_session_p_q_const__char__void { private HandleRef swigCPtr;

1 0

[commit] r11281 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: mikej Date: Mon Jan 19 11:02:30 2009 New Revision: 11281 Log: fix windows build Modified: freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Mon Jan 19 11:02:30 2009 @@ -221,11 +221,11 @@ { uint32_t i; - *hups = 0; - *idx = IDX_NADA; - int rval = 0; + uint8_t rval = 0; switch_channel_t *caller_channel = NULL; int pindex = -1; + *hups = 0; + *idx = IDX_NADA; if (session) { caller_channel = switch_core_session_get_channel(session);

1 0

[commit] r11280 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 10:53:51 2009 New Revision: 11280 Log: no timers with 0 interval Modified: freeswitch/trunk/src/switch_time.c Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Mon Jan 19 10:53:51 2009 @@ -238,7 +238,7 @@ } } - if (globals.RUNNING != 1 || !globals.mutex) { + if (globals.RUNNING != 1 || !globals.mutex || timer->interval < 1) { return SWITCH_STATUS_FALSE; } @@ -255,7 +255,7 @@ private_info->roll = TIMER_MATRIX[timer->interval].roll; private_info->ready = 1; - if (timer->interval < MS_PER_TICK) { + if (timer->interval > 0 && timer->interval < MS_PER_TICK) { MS_PER_TICK = timer->interval; }

1 0

[commit] r11279 - freeswitch/trunk/scripts/contrib/Phil/pylons
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: Phil Date: Mon Jan 19 10:30:20 2009 New Revision: 11279 Log: pylons controllers for FS Added: freeswitch/trunk/scripts/contrib/Phil/pylons/

1 0

[commit] r11278 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: brian Date: Mon Jan 19 10:25:49 2009 New Revision: 11278 Log: just fail silently in these cases. see FSCORE-272 Modified: freeswitch/trunk/src/switch_channel.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Jan 19 10:25:49 2009 @@ -1641,12 +1641,6 @@ return SWITCH_STATUS_FALSE; } - if (switch_channel_test_flag(channel, CF_OUTBOUND)) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CRIT, "INVALID! Channel [%s] is an outbound leg\n", channel->name); - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return SWITCH_STATUS_FALSE; - } - if (switch_channel_test_flag(channel, CF_ANSWERED)) { return SWITCH_STATUS_SUCCESS; } @@ -1655,6 +1649,10 @@ return SWITCH_STATUS_SUCCESS; } + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + return SWITCH_STATUS_SUCCESS; + } + msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.from = channel->name; status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line); @@ -1679,12 +1677,6 @@ return SWITCH_STATUS_FALSE; } - if (switch_channel_test_flag(channel, CF_OUTBOUND)) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CRIT, "INVALID! Channel [%s] is an outbound leg\n", channel->name); - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return SWITCH_STATUS_FALSE; - } - if (switch_channel_test_flag(channel, CF_ANSWERED)) { return SWITCH_STATUS_SUCCESS; } @@ -1693,6 +1685,10 @@ return SWITCH_STATUS_SUCCESS; } + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + return SWITCH_STATUS_SUCCESS; + } + msg.message_id = SWITCH_MESSAGE_INDICATE_RINGING; msg.from = channel->name; status = switch_core_session_perform_receive_message(channel->session, &msg, file, func, line); @@ -1794,13 +1790,11 @@ return SWITCH_STATUS_FALSE; } - if (switch_channel_test_flag(channel, CF_OUTBOUND)) { - switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CRIT, "INVALID! Channel [%s] is an outbound leg\n", channel->name); - switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); - return SWITCH_STATUS_FALSE; + if (switch_channel_test_flag(channel, CF_ANSWERED)) { + return SWITCH_STATUS_SUCCESS; } - if (switch_channel_test_flag(channel, CF_ANSWERED)) { + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { return SWITCH_STATUS_SUCCESS; } @@ -1814,8 +1808,6 @@ switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION); } - - return status; }

1 0

[commit] r11277 - in freeswitch/trunk/src/mod/languages/mod_managed: . managed
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: brian Date: Mon Jan 19 10:15:21 2009 New Revision: 11277 Log: swigall Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs 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 Mon Jan 19 10:15:21 2009 @@ -20087,6 +20087,18 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_mux_channels(void * jarg1, unsigned long jarg2, unsigned long jarg3) { + int16_t *arg1 = (int16_t *) 0 ; + uint32_t arg2 ; + uint32_t arg3 ; + + arg1 = (int16_t *)jarg1; + arg2 = (uint32_t)jarg2; + arg3 = (uint32_t)jarg3; + switch_mux_channels(arg1,arg2,arg3); +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_unicast_conninfo_session_set(void * jarg1, void * jarg2) { switch_unicast_conninfo *arg1 = (switch_unicast_conninfo *) 0 ; switch_core_session_t *arg2 = (switch_core_session_t *) 0 ; 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 Mon Jan 19 10:15:21 2009 @@ -2883,6 +2883,10 @@ return ret; } + public static void switch_mux_channels(SWIGTYPE_p_short data, uint samples, uint channels) { + freeswitchPINVOKE.switch_mux_channels(SWIGTYPE_p_short.getCPtr(data), samples, channels); + } + public static switch_status_t switch_ivr_deactivate_unicast(SWIGTYPE_p_switch_core_session session) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_ivr_deactivate_unicast(SWIGTYPE_p_switch_core_session.getCPtr(session)); return ret; @@ -9137,6 +9141,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_merge_sln")] public static extern uint switch_merge_sln(HandleRef jarg1, uint jarg2, HandleRef jarg3, uint jarg4); + [DllImport("mod_managed", EntryPoint="CSharp_switch_mux_channels")] + public static extern void switch_mux_channels(HandleRef jarg1, uint jarg2, uint jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_unicast_conninfo_session_set")] public static extern void switch_unicast_conninfo_session_set(HandleRef jarg1, HandleRef jarg2);

1 0

[commit] r11275 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/applications/mod_dptools
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 10:10:54 2009 New Revision: 11275 Log: pass one on refactor Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Mon Jan 19 10:10:54 2009 @@ -298,7 +298,8 @@ */ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_session_t *session, const char *key, const char *tone_spec, - const char *flags, time_t timeout, int hits, const char *app, const char *data); + const char *flags, time_t timeout, int hits, + const char *app, const char *data, switch_tone_detect_callback_t callback); Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Jan 19 10:10:54 2009 @@ -1343,6 +1343,7 @@ typedef struct switch_core_port_allocator switch_core_port_allocator_t; typedef struct switch_media_bug switch_media_bug_t; typedef switch_bool_t (*switch_media_bug_callback_t) (switch_media_bug_t *, void *, switch_abc_type_t); +typedef switch_bool_t (*switch_tone_detect_callback_t) (switch_core_session_t *, const char *, const char *); typedef struct switch_xml_binding switch_xml_binding_t; typedef switch_status_t (*switch_core_codec_encode_func_t) (switch_codec_t *codec, 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 Mon Jan 19 10:10:54 2009 @@ -1405,7 +1405,7 @@ } } - switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, hits, argv[5], argv[6]); + switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, hits, argv[5], argv[6], NULL); stream->write_function(stream, "+OK Enabling tone detection '%s' '%s' '%s'\n", argv[1], argv[2], argv[3]); done: 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 Mon Jan 19 10:10:54 2009 @@ -1178,7 +1178,7 @@ SWITCH_STANDARD_APP(fax_detect_session_function) { - switch_ivr_tone_detect_session(session, "fax", "1100.0", "r", 0, 1, NULL, NULL); + switch_ivr_tone_detect_session(session, "fax", "1100.0", "r", 0, 1, NULL, NULL, NULL); } SWITCH_STANDARD_APP(system_session_function) @@ -1234,7 +1234,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling tone detection '%s' '%s'\n", argv[0], argv[1]); - switch_ivr_tone_detect_session(session, argv[0], argv[1], argv[2], to, hits, argv[4], argv[5]); + switch_ivr_tone_detect_session(session, argv[0], argv[1], argv[2], to, hits, argv[4], argv[5], NULL); } SWITCH_STANDARD_APP(stop_fax_detect_session_function) Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Mon Jan 19 10:10:54 2009 @@ -1197,6 +1197,8 @@ int hits; int sleep; int expires; + int once; + switch_tone_detect_callback_t callback; } switch_tone_detect_t; typedef struct { @@ -1211,6 +1213,7 @@ switch_tone_container_t *cont = (switch_tone_container_t *) user_data; switch_frame_t *frame = NULL; int i = 0; + switch_bool_t rval = SWITCH_TRUE; switch (type) { case SWITCH_ABC_TYPE_INIT: @@ -1264,8 +1267,13 @@ if (cont->list[i].hits >= cont->list[i].total_hits) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); cont->list[i].up = 0; - - if (cont->list[i].app) { + if (cont->list[i].once) { + rval = SWITCH_FALSE; + } + + if (cont->list[i].callback) { + rval = cont->list[i].callback(cont->session, cont->list[i].app, cont->list[i].data); + } else if (cont->list[i].app) { 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", cont->list[i].app); @@ -1278,7 +1286,7 @@ if (switch_event_create(&event, SWITCH_EVENT_DETECTED_TONE) == SWITCH_STATUS_SUCCESS) { switch_event_t *dup; switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Detected-Tone", cont->list[i].key); - + if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { switch_event_fire(&dup); } @@ -1298,7 +1306,7 @@ default: break; } - return SWITCH_TRUE; + return rval; } SWITCH_DECLARE(switch_status_t) switch_ivr_stop_tone_detect_session(switch_core_session_t *session) @@ -1316,7 +1324,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_session_t *session, const char *key, const char *tone_spec, - const char *flags, time_t timeout, int hits, const char *app, const char *data) + const char *flags, time_t timeout, + int hits, const char *app, const char *data, + switch_tone_detect_callback_t callback) { switch_channel_t *channel = switch_core_session_get_channel(session); switch_codec_t *read_codec = switch_core_session_get_read_codec(session); @@ -1395,6 +1405,8 @@ cont->list[cont->index].data = switch_core_session_strdup(session, data); } + cont->list[cont->index].callback = callback; + if (!hits) hits = 1; cont->list[cont->index].hits = 0; @@ -1410,6 +1422,10 @@ if (switch_strlen_zero(flags)) { bflags = SMBF_READ_REPLACE; } else { + if (strchr(flags, 'o')) { + cont->list[cont->index].once = 1; + } + if (strchr(flags, 'r')) { bflags |= SMBF_READ_REPLACE; } else if (strchr(flags, 'w')) {

1 0

[commit] r11274 - freeswitch/trunk/src
by FreeSWITCH SVN 19 Jan '09

19 Jan '09

Author: anthm Date: Mon Jan 19 10:00:11 2009 New Revision: 11274 Log: FSCORE-272 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Jan 19 10:00:11 2009 @@ -1641,6 +1641,12 @@ return SWITCH_STATUS_FALSE; } + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CRIT, "INVALID! Channel [%s] is an outbound leg\n", channel->name); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_STATUS_FALSE; + } + if (switch_channel_test_flag(channel, CF_ANSWERED)) { return SWITCH_STATUS_SUCCESS; } @@ -1673,6 +1679,12 @@ return SWITCH_STATUS_FALSE; } + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CRIT, "INVALID! Channel [%s] is an outbound leg\n", channel->name); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_STATUS_FALSE; + } + if (switch_channel_test_flag(channel, CF_ANSWERED)) { return SWITCH_STATUS_SUCCESS; } @@ -1782,6 +1794,12 @@ return SWITCH_STATUS_FALSE; } + if (switch_channel_test_flag(channel, CF_OUTBOUND)) { + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CRIT, "INVALID! Channel [%s] is an outbound leg\n", channel->name); + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + return SWITCH_STATUS_FALSE; + } + if (switch_channel_test_flag(channel, CF_ANSWERED)) { return SWITCH_STATUS_SUCCESS; } Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Jan 19 10:00:11 2009 @@ -41,7 +41,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_sleep(switch_core_session_t *session, uint32_t ms, switch_bool_t sync, switch_input_args_t *args) { switch_channel_t *channel = switch_core_session_get_channel(session); - int media_ready = 0; switch_status_t status = SWITCH_STATUS_SUCCESS; switch_time_t start = switch_timestamp_now(), now, done = switch_timestamp_now() + (ms * 1000); switch_frame_t *read_frame, cng_frame = { 0 }; @@ -55,16 +54,20 @@ int sval = 0; const char *var; - if (!switch_channel_test_flag(channel, CF_PROXY_MODE) && !switch_channel_media_ready(channel) && !switch_channel_test_flag(channel, CF_SERVICE)) { + if (!switch_channel_test_flag(channel, CF_OUTBOUND) && !switch_channel_test_flag(channel, CF_PROXY_MODE) && + !switch_channel_media_ready(channel) && !switch_channel_test_flag(channel, CF_SERVICE)) { if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot establish media.\n"); return SWITCH_STATUS_FALSE; } } - media_ready = (switch_channel_media_ready(channel) && !switch_channel_test_flag(channel, CF_SERVICE)); - - if (ms > 100 && media_ready && (var = switch_channel_get_variable(channel, SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE)) && (sval = atoi(var))) { + if (!switch_channel_media_ready(channel)) { + switch_yield(ms * 1000); + return SWITCH_STATUS_SUCCESS; + } + + if (ms > 100 && (var = switch_channel_get_variable(channel, SWITCH_SEND_SILENCE_WHEN_IDLE_VARIABLE)) && (sval = atoi(var))) { switch_core_session_get_read_impl(session, &imp); if (switch_core_codec_init(&codec, @@ -102,7 +105,7 @@ cng_frame.buflen = 2; switch_set_flag((&cng_frame), SFF_CNG); - if (sync && media_ready) { + if (sync) { switch_channel_audio_sync(channel); } @@ -169,11 +172,6 @@ } } - if (!media_ready) { - switch_cond_next(); - continue; - } - status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); if (!SWITCH_READ_ACCEPTABLE(status)) {

1 0