- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

19 Nov '08

Author: anthm Date: Tue Nov 18 20:00:44 2008 New Revision: 10450 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h 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 Nov 18 20:00:44 2008 @@ -54,6 +54,7 @@ #endif #define MAX_CODEC_CHECK_FRAMES 50 +#define MAX_MISMATCH_FRAMES 5 #define MODNAME "mod_sofia" static const switch_state_handler_table_t noop_state_handler = { 0 }; struct sofia_gateway; @@ -511,6 +512,7 @@ switch_thread_id_t locker; switch_size_t last_ts; uint32_t check_frames; + uint32_t mismatch_count; }; struct callback_t {

1 0

[commit] r10449 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 18:44:41 2008 New Revision: 10449 Log: update 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 Tue Nov 18 18:44:41 2008 @@ -771,7 +771,7 @@ } else { memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, - "Problem RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet); + "Problem RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet / 1000); return SWITCH_STATUS_FALSE; } }

1 0

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

18 Nov '08

Author: anthm Date: Tue Nov 18 18:40:49 2008 New Revision: 10448 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Nov 18 18:40:49 2008 @@ -758,8 +758,9 @@ } if (switch_rtp_change_interval(tech_pvt->rtp_session, - tech_pvt->read_codec.implementation->samples_per_packet, - tech_pvt->codec_ms * 1000) != SWITCH_STATUS_SUCCESS) { + tech_pvt->codec_ms * 1000, + tech_pvt->read_codec.implementation->samples_per_packet + ) != SWITCH_STATUS_SUCCESS) { switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); }

1 0

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

18 Nov '08

Author: anthm Date: Tue Nov 18 18:26:25 2008 New Revision: 10447 Log: update Modified: freeswitch/trunk/src/include/switch_rtp.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/include/switch_rtp.h ============================================================================== --- freeswitch/trunk/src/include/switch_rtp.h (original) +++ freeswitch/trunk/src/include/switch_rtp.h Tue Nov 18 18:26:25 2008 @@ -111,7 +111,7 @@ SWITCH_DECLARE(switch_port_t) switch_rtp_request_port(const char *ip); SWITCH_DECLARE(void) switch_rtp_release_port(const char *ip, switch_port_t port); -SWITCH_DECLARE(void) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval); +SWITCH_DECLARE(switch_status_t) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval); /*! \brief create a new RTP session handle \param new_rtp_session a poiter to aim at the new session 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 Nov 18 18:26:25 2008 @@ -757,9 +757,12 @@ tech_pvt->read_codec.implementation->samples_per_packet; } - switch_rtp_change_interval(tech_pvt->rtp_session, - tech_pvt->read_codec.implementation->samples_per_packet, - tech_pvt->codec_ms * 1000); + if (switch_rtp_change_interval(tech_pvt->rtp_session, + tech_pvt->read_codec.implementation->samples_per_packet, + tech_pvt->codec_ms * 1000) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + + } tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; } Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue Nov 18 18:26:25 2008 @@ -754,7 +754,7 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(void) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval) +SWITCH_DECLARE(switch_status_t) switch_rtp_change_interval(switch_rtp_t *rtp_session, uint32_t ms_per_packet, uint32_t samples_per_interval) { rtp_session->ms_per_packet = ms_per_packet; rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval; @@ -764,11 +764,19 @@ if (rtp_session->timer.timer_interface) { switch_core_timer_destroy(&rtp_session->timer); } - switch_core_timer_init(&rtp_session->timer, rtp_session->timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, - "RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet); + if (switch_core_timer_init(&rtp_session->timer, + rtp_session->timer_name, ms_per_packet / 1000, samples_per_interval, rtp_session->pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, + "RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet); + } else { + memset(&rtp_session->timer, 0, sizeof(rtp_session->timer)); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, + "Problem RE-Starting timer [%s] %d bytes per %dms\n", rtp_session->timer_name, samples_per_interval, ms_per_packet); + return SWITCH_STATUS_FALSE; + } } + return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session,

1 0

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

18 Nov '08

Author: anthm Date: Tue Nov 18 17:46:40 2008 New Revision: 10446 Log: sigh Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Nov 18 17:46:40 2008 @@ -3290,8 +3290,12 @@ int tmp; /* move signal_ptr where we need it (right past Signal=) */ signal_ptr = signal_ptr + 7; - tmp = atoi(signal_ptr); - dtmf.digit = switch_rfc2833_to_char(tmp); + if (is_dtmf(*signal_ptr)) { + dtmf.digit = *signal_ptr; + } else { + tmp = atoi(signal_ptr); + dtmf.digit = switch_rfc2833_to_char(tmp); + } } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n"); goto fail; @@ -3300,6 +3304,7 @@ if ((signal_ptr = switch_stristr("Duration=", sip->sip_payload->pl_data))) { int tmp; signal_ptr += 9; + if ((tmp = atoi(signal_ptr)) <= 0) { tmp = switch_core_default_dtmf_duration(0); } Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Nov 18 17:46:40 2008 @@ -1128,9 +1128,6 @@ SWITCH_DECLARE(char) switch_rfc2833_to_char(int event) { if (event > -1 && event < (int32_t) sizeof(RFC2833_CHARS)) { - if (is_dtmf(event)) { - return (char) event; - } return RFC2833_CHARS[event]; } return '\0';

1 0

[commit] r10445 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 17:36:31 2008 New Revision: 10445 Log: update 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 Tue Nov 18 17:36:31 2008 @@ -1290,6 +1290,15 @@ goto end; } + if (rtp_session->max_missed_packets) { + if (bytes) { + rtp_session->missed_count = 0; + } else if (++rtp_session->missed_count >= rtp_session->max_missed_packets) { + ret = -2; + goto end; + } + } + check = !bytes; if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_BREAK)) { @@ -1522,13 +1531,6 @@ } if (check || (bytes && !rtp_session->timer.interval)) { - if (!bytes && rtp_session->max_missed_packets) { - if (++rtp_session->missed_count >= rtp_session->max_missed_packets) { - ret = -2; - goto end; - } - } - if (rtp_session->jb && (jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); if (jb_frame->plc) {

1 0

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

18 Nov '08

Author: anthm Date: Tue Nov 18 17:15:51 2008 New Revision: 10444 Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Nov 18 17:15:51 2008 @@ -713,6 +713,10 @@ tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES; } else { if (switch_rtp_ready(tech_pvt->rtp_session) && codec_ms != tech_pvt->codec_ms) { + const char *val; + int rtp_timeout_sec = 0; + int rtp_hold_timeout_sec = 0; + tech_pvt->codec_ms = codec_ms; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Changing codec ptime to %d. I bet you have a linksys/sipura =D\n", tech_pvt->codec_ms); @@ -723,6 +727,36 @@ return SWITCH_STATUS_GENERR; } + + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_timeout_sec = v; + } + } + + if ((val = switch_channel_get_variable(tech_pvt->channel, "rtp_hold_timeout_sec"))) { + int v = atoi(val); + if (v >= 0) { + rtp_hold_timeout_sec = v; + } + } + + if (rtp_timeout_sec) { + tech_pvt->max_missed_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_packet; + + switch_rtp_set_max_missed_packets(tech_pvt->rtp_session, tech_pvt->max_missed_packets); + if (!rtp_hold_timeout_sec) { + rtp_hold_timeout_sec = rtp_timeout_sec * 10; + } + } + + if (rtp_hold_timeout_sec) { + tech_pvt->max_missed_hold_packets = (tech_pvt->read_codec.implementation->samples_per_second * rtp_hold_timeout_sec) / + tech_pvt->read_codec.implementation->samples_per_packet; + } + switch_rtp_change_interval(tech_pvt->rtp_session, tech_pvt->read_codec.implementation->samples_per_packet, tech_pvt->codec_ms * 1000);

1 0

[commit] r10443 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 17:15:02 2008 New Revision: 10443 Log: let ppl do info dtmf wrong Modified: freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Nov 18 17:15:02 2008 @@ -1128,6 +1128,9 @@ SWITCH_DECLARE(char) switch_rfc2833_to_char(int event) { if (event > -1 && event < (int32_t) sizeof(RFC2833_CHARS)) { + if (is_dtmf(event)) { + return (char) event; + } return RFC2833_CHARS[event]; } return '\0';

1 0

[commit] r10442 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 15:40:44 2008 New Revision: 10442 Log: update 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 Tue Nov 18 15:40:44 2008 @@ -758,7 +758,8 @@ { rtp_session->ms_per_packet = ms_per_packet; rtp_session->samples_per_interval = rtp_session->conf_samples_per_interval = samples_per_interval; - + rtp_session->missed_count = 0; + if (rtp_session->timer_name) { if (rtp_session->timer.timer_interface) { switch_core_timer_destroy(&rtp_session->timer);

1 0

[commit] r10441 - freeswitch/trunk/src
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 11:13:03 2008 New Revision: 10441 Log: coding blind is annoying Modified: freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Tue Nov 18 11:13:03 2008 @@ -1226,7 +1226,7 @@ } for (i = 0; i < cont->index; i++) { - if (cont->list[i].expires && cont->list[i].expires > switch_timestamp(NULL)) { + if (cont->list[i].expires && cont->list[i].expires < switch_timestamp(NULL)) { cont->list[i].hits = 0; cont->list[i].sleep = 0; cont->list[i].expires = 0; @@ -1244,7 +1244,7 @@ cont->list[i].expires = switch_timestamp(NULL) + 5; teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n", - cont->list[i].key, cont->list[i].up, cont->list[i].total_hits); + cont->list[i].key, cont->list[i].up, cont->list[i].hits); if (cont->list[i].hits >= cont->list[i].total_hits) {

1 0