- Freeswitch-svn - FreeSWITCH Mailing Lists

[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

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

18 Nov '08

Author: anthm Date: Tue Nov 18 10:47:46 2008 New Revision: 10440 Log: close MODENDP-149 Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c Tue Nov 18 10:47:46 2008 @@ -694,6 +694,7 @@ switch_snprintf(name, sizeof(name), "loopback/%s-a", caller_profile->destination_number); switch_channel_set_name(channel, name); + switch_channel_set_flag(channel, CF_OUTBOUND); switch_channel_set_caller_profile(channel, caller_profile); tech_pvt->caller_profile = caller_profile;

1 0

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

18 Nov '08

Author: anthm Date: Tue Nov 18 10:24:52 2008 New Revision: 10439 Log: add chan vars to param event during hangup hook Modified: freeswitch/trunk/src/switch_core_state_machine.c Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Tue Nov 18 10:24:52 2008 @@ -412,6 +412,7 @@ *arg++ = '\0'; } SWITCH_STANDARD_STREAM(stream); + switch_channel_get_variables(session->channel, &stream.param_event); switch_api_execute(cmd, arg, NULL, &stream); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, arg, switch_str_nil((char *) stream.data));

1 0

[commit] r10438 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: anthm Date: Tue Nov 18 10:11:17 2008 New Revision: 10438 Log: update Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_async.c 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 Tue Nov 18 10:11:17 2008 @@ -1236,8 +1236,8 @@ } } - if (argv[7]) { - hits = atoi(argv[7]); + if (argv[6]) { + hits = atoi(argv[6]); if (hits < 0) { hits = 1; } 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 10:11:17 2008 @@ -1227,7 +1227,8 @@ for (i = 0; i < cont->index; i++) { if (cont->list[i].expires && cont->list[i].expires > switch_timestamp(NULL)) { - cont->list[i].hits = cont->list[i].total_hits; + cont->list[i].hits = 0; + cont->list[i].sleep = 0; cont->list[i].expires = 0; } @@ -1238,38 +1239,41 @@ if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) { switch_event_t *event; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key); - if (cont->list[i].hits) { - cont->list[i].up = cont->list[i].hits--; - cont->list[i].sleep = 25; - cont->list[i].expires = switch_timestamp(NULL) + 5; - teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); - } else { - cont->list[i].up = 0; - } + cont->list[i].up = cont->list[i].hits++; + cont->list[i].sleep = 25; + 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); - 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); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); - switch_core_session_queue_private_event(cont->session, &event); - } - } - - 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); + 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 (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); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", cont->list[i].data); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5); + switch_core_session_queue_private_event(cont->session, &event); + } } - if (switch_core_session_queue_event(cont->session, &event) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); - switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); - switch_event_fire(&event); + 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); + } + + if (switch_core_session_queue_event(cont->session, &event) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); + switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); + switch_event_fire(&event); + } } } } @@ -1325,6 +1329,9 @@ if (!switch_strlen_zero(cont->list[cont->index].key) && !strcasecmp(key, cont->list[cont->index].key)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-enabling %s\n", key); cont->list[cont->index].up = 1; + cont->list[i].hits = 0; + cont->list[i].sleep = 0; + cont->list[i].expires = 0; teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map); return SWITCH_STATUS_SUCCESS; } @@ -1340,7 +1347,7 @@ return SWITCH_STATUS_MEMERR; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding tone spec %s index %d\n", tone_spec, cont->index); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding tone spec %s index %d hits %d\n", tone_spec, cont->index, hits); i = 0; p = (char *) tone_spec; @@ -1377,7 +1384,7 @@ if (!hits) hits = 1; - cont->list[cont->index].hits = hits; + cont->list[cont->index].hits = 0; cont->list[cont->index].total_hits = hits; cont->list[cont->index].up = 1;

1 0

[commit] r10437 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 18 Nov '08

18 Nov '08

Author: gmaruzz Date: Tue Nov 18 03:30:30 2008 New Revision: 10437 Log: skypiax: added license Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax/mod_skypiax.c Tue Nov 18 03:30:30 2008 @@ -1,3 +1,39 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * This module (mod_skypiax) has been contributed by: + * + * Giovanni Maruzzelli (gmaruzz(a)gmail.com) + * + * + * Further Contributors: + * + * + * + * mod_skypiax.c -- Skype compatible Endpoint Module + * + */ + #define MOD_SKYPIAX #ifdef MOD_SKYPIAX

1 0