- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r11348 - freeswitch/trunk/src
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: anthm Date: Wed Jan 21 18:18:00 2009 New Revision: 11348 Log: update Modified: freeswitch/trunk/src/switch_core_file.c Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Wed Jan 21 18:18:00 2009 @@ -221,8 +221,8 @@ switch_buffer_create_dynamic(&fh->buffer, factor, factor, 0); switch_assert(fh->buffer); } - if (!fh->dbuf) { - fh->dbuflen = want * 8; + if (!fh->dbuf || fh->dbuflen < fh->resampler->to_len * 2) { + fh->dbuflen = fh->resampler->to_len * 2; fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen);

1 0

[commit] r11347 - freeswitch/trunk/libs/portaudio/src/common
by FreeSWITCH SVN 22 Jan '09

22 Jan '09

Author: anthm Date: Wed Jan 21 18:13:51 2009 New Revision: 11347 Log: hack pa Modified: freeswitch/trunk/libs/portaudio/src/common/pa_front.c Modified: freeswitch/trunk/libs/portaudio/src/common/pa_front.c ============================================================================== --- freeswitch/trunk/libs/portaudio/src/common/pa_front.c (original) +++ freeswitch/trunk/libs/portaudio/src/common/pa_front.c Wed Jan 21 18:13:51 2009 @@ -1338,8 +1338,8 @@ else if( result == 0 ) result = interface->Abort( stream ); - if( result == paNoError ) /** @todo REVIEW: shouldn't we close anyway? */ - result = interface->Close( stream ); + //if( result == paNoError ) /** @todo REVIEW: shouldn't we close anyway? (probably!)*/ + result = interface->Close( stream ); } PA_LOGAPI_EXIT_PAERROR( "Pa_CloseStream", result );

1 0

[commit] r11344 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: anthm Date: Wed Jan 21 17:09:12 2009 New Revision: 11344 Log: fix auto_answer on pa Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Wed Jan 21 17:09:12 2009 @@ -69,7 +69,8 @@ TFLAG_LINEAR = (1 << 6), TFLAG_ANSWER = (1 << 7), TFLAG_HUP = (1 << 8), - TFLAG_MASTER = (1 << 9) + TFLAG_MASTER = (1 << 9), + TFLAG_AUTO_ANSWER = (1 << 10) } TFLAGS; struct private_object { @@ -233,8 +234,18 @@ } } - switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); - switch_channel_mark_ring_ready(channel); + + if (switch_test_flag(tech_pvt, TFLAG_AUTO_ANSWER)) { + switch_mutex_lock(globals.pvt_lock); + add_pvt(tech_pvt, PA_MASTER); + switch_channel_mark_answered(channel); + switch_set_flag(tech_pvt, TFLAG_ANSWER); + switch_mutex_unlock(globals.pvt_lock); + } else { + switch_core_session_queue_indication(session, SWITCH_MESSAGE_INDICATE_RINGING); + switch_channel_mark_ring_ready(channel); + } + while (switch_channel_get_state(channel) == CS_INIT && !switch_test_flag(tech_pvt, TFLAG_ANSWER)) { switch_size_t olen = globals.timer.samples; @@ -704,7 +715,7 @@ switch_channel_set_caller_profile(channel, caller_profile); tech_pvt->caller_profile = caller_profile; if (outbound_profile->destination_number && !strcasecmp(outbound_profile->destination_number, "auto_answer")) { - switch_set_flag(tech_pvt, TFLAG_ANSWER); + switch_set_flag(tech_pvt, TFLAG_AUTO_ANSWER); } } else { @@ -1460,8 +1471,8 @@ } else { switch_channel_t *channel = switch_core_session_get_channel(tp->session); switch_set_flag_locked(tp, TFLAG_ANSWER); - switch_channel_mark_answered(channel); add_pvt(tp, PA_MASTER); + switch_channel_mark_answered(channel); } } else { stream->write_function(stream, "NO SUCH CALL\n"); @@ -1474,8 +1485,8 @@ if (!switch_test_flag(tp, TFLAG_ANSWER)) { switch_channel_t *channel = switch_core_session_get_channel(tp->session); switch_set_flag_locked(tp, TFLAG_ANSWER); - switch_channel_mark_answered(channel); add_pvt(tp, PA_MASTER); + switch_channel_mark_answered(channel); x++; break; }

1 0

[commit] r11343 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: anthm Date: Wed Jan 21 16:57:58 2009 New Revision: 11343 Log: MODENDP-176 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 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 Wed Jan 21 16:57:58 2009 @@ -1712,7 +1712,7 @@ switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "sip_auth_realm", realm); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "mailbox", mailbox); switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "user_name", username); - switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "domain_name", realm); + switch_event_add_header_string(*v_event, SWITCH_STACK_BOTTOM, "domain_name", domain_name); if ((dparams = switch_xml_child(domain, "variables"))) { xparams[i++] = dparams;

1 0

[commit] r11342 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: anthm Date: Wed Jan 21 16:40:50 2009 New Revision: 11342 Log: bangarang Modified: freeswitch/trunk/src/switch_core_io.c Modified: freeswitch/trunk/src/switch_core_io.c ============================================================================== --- freeswitch/trunk/src/switch_core_io.c (original) +++ freeswitch/trunk/src/switch_core_io.c Wed Jan 21 16:40:50 2009 @@ -616,7 +616,7 @@ if ((session->write_codec && frame->codec && session->write_codec->implementation != frame->codec->implementation)) { - if (session->write_impl.codec_id == frame->codec->implementation->codec_id) { + if (session->write_impl.codec_id != frame->codec->implementation->codec_id) { ptime_mismatch = TRUE; if (switch_test_flag(frame->codec, SWITCH_CODEC_FLAG_PASSTHROUGH) || switch_test_flag(session->read_codec, SWITCH_CODEC_FLAG_PASSTHROUGH)) { status = perform_write(session, frame, flags, stream_id);

1 0

[commit] r11341 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: anthm Date: Wed Jan 21 16:29:01 2009 New Revision: 11341 Log: MODAPP-203 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Wed Jan 21 16:29:01 2009 @@ -878,6 +878,7 @@ } if ((serviced_uuid = switch_channel_get_variable(channel, "fifo_serviced_uuid"))) { + switch_channel_set_variable(channel, "fifo_serviced_uuid", NULL); break; }

1 0

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

21 Jan '09

Author: mikej Date: Wed Jan 21 15:35:59 2009 New Revision: 11340 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 Wed Jan 21 15:35:59 2009 @@ -8301,6 +8301,20 @@ } +SWIGEXPORT int SWIGSTDCALL CSharp_switch_string_var_check(char * jarg1, int jarg2) { + int jresult ; + char *arg1 = (char *) 0 ; + switch_bool_t arg2 ; + switch_bool_t result; + + arg1 = (char *)jarg1; + arg2 = (switch_bool_t)jarg2; + result = (switch_bool_t)switch_string_var_check(arg1,arg2); + jresult = result; + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_switch_clean_string(char * jarg1) { char * jresult ; char *arg1 = (char *) 0 ; @@ -17946,17 +17960,19 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable(void * jarg1, char * jarg2, char * jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) { int jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; + switch_bool_t arg4 ; switch_status_t result; arg1 = (switch_channel_t *)jarg1; arg2 = (char *)jarg2; arg3 = (char *)jarg3; - result = (switch_status_t)switch_channel_set_variable(arg1,(char const *)arg2,(char const *)arg3); + arg4 = (switch_bool_t)jarg4; + result = (switch_status_t)switch_channel_set_variable_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4); jresult = result; return jresult; } @@ -17979,17 +17995,19 @@ } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_partner(void * jarg1, char * jarg2, char * jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_set_variable_partner_var_check(void * jarg1, char * jarg2, char * jarg3, int jarg4) { int jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; char *arg2 = (char *) 0 ; char *arg3 = (char *) 0 ; + switch_bool_t arg4 ; switch_status_t result; arg1 = (switch_channel_t *)jarg1; arg2 = (char *)jarg2; arg3 = (char *)jarg3; - result = (switch_status_t)switch_channel_set_variable_partner(arg1,(char const *)arg2,(char const *)arg3); + arg4 = (switch_bool_t)jarg4; + result = (switch_status_t)switch_channel_set_variable_partner_var_check(arg1,(char const *)arg2,(char const *)arg3,arg4); jresult = result; return jresult; } Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Wed Jan 21 15:35:59 2009 @@ -2094,6 +2094,11 @@ return ret; } + public static switch_bool_t switch_string_var_check(string s, switch_bool_t disable) { + switch_bool_t ret = (switch_bool_t)freeswitchPINVOKE.switch_string_var_check(s, (int)disable); + return ret; + } + public static string switch_clean_string(string s) { string ret = freeswitchPINVOKE.switch_clean_string(s); return ret; @@ -2394,8 +2399,8 @@ return ret; } - public static switch_status_t switch_channel_set_variable(SWIGTYPE_p_switch_channel channel, string varname, string value) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_variable(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value); + public static switch_status_t switch_channel_set_variable_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_variable_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check); return ret; } @@ -2404,8 +2409,8 @@ return ret; } - public static switch_status_t switch_channel_set_variable_partner(SWIGTYPE_p_switch_channel channel, string varname, string value) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_variable_partner(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value); + public static switch_status_t switch_channel_set_variable_partner_var_check(SWIGTYPE_p_switch_channel channel, string varname, string value, switch_bool_t var_check) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_channel_set_variable_partner_var_check(SWIGTYPE_p_switch_channel.getCPtr(channel), varname, value, (int)var_check); return ret; } @@ -6284,6 +6289,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_char_to_rfc2833")] public static extern byte switch_char_to_rfc2833(char jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_string_var_check")] + public static extern int switch_string_var_check(string jarg1, int jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_clean_string")] public static extern string switch_clean_string(string jarg1); @@ -8672,14 +8680,14 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_uuid")] public static extern string switch_channel_get_uuid(HandleRef jarg1); - [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable")] - public static extern int switch_channel_set_variable(HandleRef jarg1, string jarg2, string jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_var_check")] + public static extern int switch_channel_set_variable_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_printf")] public static extern int switch_channel_set_variable_printf(HandleRef jarg1, string jarg2, string jarg3); - [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_partner")] - public static extern int switch_channel_set_variable_partner(HandleRef jarg1, string jarg2, string jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_set_variable_partner_var_check")] + public static extern int switch_channel_set_variable_partner_var_check(HandleRef jarg1, string jarg2, string jarg3, int jarg4); [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_variable_partner")] public static extern string switch_channel_get_variable_partner(HandleRef jarg1, string jarg2);

1 0

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

21 Jan '09

Author: anthm Date: Wed Jan 21 15:34:31 2009 New Revision: 11339 Log: taint check MODW00T-00 Modified: freeswitch/trunk/src/include/switch_channel.h freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_caller.c freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/include/switch_channel.h ============================================================================== --- freeswitch/trunk/src/include/switch_channel.h (original) +++ freeswitch/trunk/src/include/switch_channel.h Wed Jan 21 15:34:31 2009 @@ -219,12 +219,19 @@ \param value the vaule of the variable \returns SWITCH_STATUS_SUCCESS if successful */ -SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *channel, const char *varname, const char *value); + +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel, + const char *varname, const char *value, switch_bool_t var_check); SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_printf(switch_channel_t *channel, const char *varname, const char *fmt, ...); -SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_partner(switch_channel_t *channel, const char *varname, const char *value); +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_partner_var_check(switch_channel_t *channel, + const char *varname, const char *value, switch_bool_t var_check); SWITCH_DECLARE(const char *) switch_channel_get_variable_partner(switch_channel_t *channel, const char *varname); + +#define switch_channel_set_variable(_channel, _var, _val) switch_channel_set_variable_var_check(_channel, _var, _val, SWITCH_TRUE) +#define switch_channel_set_variable_partner(_channel, _var, _val) switch_channel_set_variable_partner_var_check(_channel, _var, _val, SWITCH_TRUE) + /*! \brief Retrieve a variable from a given channel \param channel channel to retrieve variable from Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Wed Jan 21 15:34:31 2009 @@ -280,7 +280,32 @@ #define switch_set_string(_dst, _src) switch_copy_string(_dst, _src, sizeof(_dst)) - static inline char *switch_clean_string(char *s) +static inline switch_bool_t switch_string_var_check(char *s, switch_bool_t disable) +{ + char *p; + char *dol = NULL; + + for (p = s; p && *p; p++) { + if (*p == '$') { + dol = p; + } else if (dol) { + if (*p == '{') { + if (disable) { + *dol = '%'; + dol = NULL; + } else { + return SWITCH_TRUE; + } + } else if (*p != '\\') { + dol = NULL; + } + } + } + return SWITCH_FALSE; +} + + +static inline char *switch_clean_string(char *s) { char *p; for (p = s; p && *p; p++) { 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 Wed Jan 21 15:34:31 2009 @@ -697,7 +697,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SET [%s]=[%s]\n", switch_channel_get_name(channel), var, expanded ? expanded : "UNDEF"); - switch_channel_set_variable(channel, var, expanded); + switch_channel_set_variable_var_check(channel, var, expanded, SWITCH_FALSE); if (expanded && expanded != val) { switch_safe_free(expanded); Modified: freeswitch/trunk/src/switch_caller.c ============================================================================== --- freeswitch/trunk/src/switch_caller.c (original) +++ freeswitch/trunk/src/switch_caller.c Wed Jan 21 15:34:31 2009 @@ -34,7 +34,7 @@ #include <switch_caller.h> #define profile_dup(a,b,p) if (!switch_strlen_zero(a)) { b = switch_core_strdup(p, a); } else { b = SWITCH_BLANK_STRING; } -#define profile_dup_clean(a,b,p) if (!switch_strlen_zero(a)) { b = switch_clean_string(switch_core_strdup(p, a)); } else { b = SWITCH_BLANK_STRING; } +#define profile_dup_clean(a,b,p) if (!switch_strlen_zero(a)) { b = switch_clean_string(switch_core_strdup(p, a)); switch_string_var_check( (char *) b , SWITCH_TRUE);} else { b = SWITCH_BLANK_STRING; } SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_new(switch_memory_pool_t *pool, const char *username, Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed Jan 21 15:34:31 2009 @@ -574,7 +574,8 @@ return (!switch_strlen_zero(channel->name)) ? channel->name : "N/A"; } -SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *channel, const char *varname, const char *value) +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_var_check(switch_channel_t *channel, + const char *varname, const char *value, switch_bool_t var_check) { switch_assert(channel != NULL); @@ -582,7 +583,16 @@ switch_mutex_lock(channel->profile_mutex); switch_event_del_header(channel->variables, varname); if (!switch_strlen_zero(value)) { - switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value); + int ok = 1; + + if (var_check) { + ok = !switch_string_var_check((char *)value, SWITCH_FALSE); + } + if (ok) { + switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (contains a variable)\n"); + } } switch_mutex_unlock(channel->profile_mutex); return SWITCH_STATUS_SUCCESS; @@ -623,7 +633,8 @@ } -SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_partner(switch_channel_t *channel, const char *varname, const char *value) +SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_partner_var_check(switch_channel_t *channel, + const char *varname, const char *value, switch_bool_t var_check) { const char *uuid; switch_assert(channel != NULL); @@ -633,7 +644,7 @@ switch_core_session_t *session; if ((session = switch_core_session_locate(uuid))) { switch_channel_t *tchannel = switch_core_session_get_channel(session); - switch_channel_set_variable(tchannel, varname, value); + switch_channel_set_variable_var_check(tchannel, varname, value, var_check); switch_core_session_rwunlock(session); } return SWITCH_STATUS_SUCCESS; @@ -1820,7 +1831,6 @@ char *p, *c = NULL; char *data, *indup, *endof_indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; - const char *q; char *cloned_sub_val = NULL, *sub_val = NULL; char *func_val = NULL; int nv = 0; @@ -1829,20 +1839,7 @@ return (char *) in; } - q = in; - while (q && *q) { - if (!(p = strchr(q, '$'))) { - break; - } - - if (*(p + 1) != '{') { - q = p + 1; - continue; - } - - nv = 1; - break; - } + nv = switch_string_var_check((char *)in, SWITCH_FALSE); if (!nv) { return (char *) in; Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Jan 21 15:34:31 2009 @@ -254,7 +254,9 @@ free(val); } if (value) { - switch_core_hash_insert(runtime.global_vars, varname, strdup(value)); + char *v = strdup(value); + switch_string_var_check(v, SWITCH_TRUE); + switch_core_hash_insert(runtime.global_vars, varname, v); } else { switch_core_hash_delete(runtime.global_vars, varname); } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Wed Jan 21 15:34:31 2009 @@ -1246,25 +1246,12 @@ char *p, *c = NULL; char *data, *indup, *endof_indup; size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; - const char *q, *sub_val = NULL; + const char *sub_val = NULL; char *cloned_sub_val = NULL; char *func_val = NULL; int nv = 0; - q = in; - while (q && *q) { - if (!(p = strchr(q, '$'))) { - break; - } - - if (*(p + 1) != '{') { - q = p + 1; - continue; - } - - nv = 1; - break; - } + nv = switch_string_var_check((char *)in, SWITCH_FALSE); if (!nv) { return (char *) in;

1 0

[commit] r11338 - freeswitch/trunk/src
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: brian Date: Wed Jan 21 14:47:52 2009 New Revision: 11338 Log: We should only reset sanity if we did NOT ignore the previous packet. Modified: freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Wed Jan 21 14:47:52 2009 @@ -1590,13 +1590,16 @@ if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { rtp_session->dtmf_data.in_digit_seq = in_digit_seq; - rtp_session->dtmf_data.in_digit_sanity = 2000; #ifdef DEBUG_2833 printf("read: %c %u %u %u %u %d %d %s\n", key, in_digit_seq, rtp_session->dtmf_data.in_digit_seq, ts, duration, rtp_session->recv_msg.header.m, end, end && !rtp_session->dtmf_data.in_digit_ts ? "ignored" : ""); #endif + /* only set sanity if we do NOT ignore the packet */ + if (rtp_session->dtmf_data.in_digit_ts) { + rtp_session->dtmf_data.in_digit_sanity = 2000; + } if (rtp_session->dtmf_data.last_duration > duration && ts == rtp_session->dtmf_data.in_digit_ts) { rtp_session->dtmf_data.flip++;

1 0

[commit] r11337 - freeswitch/trunk/libs/esl/src/include
by FreeSWITCH SVN 21 Jan '09

21 Jan '09

Author: mrene Date: Wed Jan 21 14:14:08 2009 New Revision: 11337 Log: Newlines Modified: freeswitch/trunk/libs/esl/src/include/esl_config.h freeswitch/trunk/libs/esl/src/include/esl_event.h freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h Modified: freeswitch/trunk/libs/esl/src/include/esl_config.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_config.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_config.h Wed Jan 21 14:14:08 2009 @@ -175,4 +175,4 @@ * End: * For VIM: * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: - */ \ No newline at end of file + */ Modified: freeswitch/trunk/libs/esl/src/include/esl_event.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_event.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_event.h Wed Jan 21 14:14:08 2009 @@ -288,4 +288,3 @@ * For VIM: * vim:set softtabstop=4 shiftwidth=4 tabstop=4: */ - Modified: freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h ============================================================================== --- freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h (original) +++ freeswitch/trunk/libs/esl/src/include/esl_threadmutex.h Wed Jan 21 14:14:08 2009 @@ -56,4 +56,3 @@ * For VIM: * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: */ -

1 0