November 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r10353 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sip
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 07:01:04 2008 New Revision: 10353 Log: Wed Oct 22 09:10:19 EDT 2008 Brian Czapiga <rys at evool dot com> * sip_bad_mask: so not require valid Supported Cisco phones seem to generate bad Supported header. Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Nov 12 07:01:04 2008 @@ -1 +1 @@ -Wed Nov 12 11:25:43 EST 2008 +Wed Nov 12 11:28:12 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask Wed Nov 12 07:01:04 2008 @@ -55,13 +55,16 @@ # # Headers that must be valid in UA, proxy or registrar -# +# Contact = sip_mask_ua | sip_mask_proxy | sip_mask_registrar Require = sip_mask_ua | sip_mask_registrar | sip_mask_timer Record-Route = sip_mask_ua | sip_mask_proxy Expires = sip_mask_registrar | sip_mask_events +# Nothing bad can happen if something looks like it is not Supported +# Supported = sip_mask_ua | sip_mask_proxy | sip_mask_registrar + # # 100rel headers #

1 0

[commit] r10352 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:59:31 2008 New Revision: 10352 Log: Tue Oct 14 09:00:06 EDT 2008 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * nua/check_session.c: Disabled OPTIONS keepalives in call tests Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Wed Nov 12 06:59:31 2008 @@ -64,6 +64,7 @@ s2_case("0.1.1", "Setup for Call Tests", ""); nua = s2_nua_setup(SIPTAG_ORGANIZATION_STR("Pussy Galore's Flying Circus"), + NUTAG_OUTBOUND("no-options-keepalive, no-validate"), TAG_END()); soa = soa_create(NULL, s2->root, NULL);

1 0

[commit] r10351 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:59:09 2008 New Revision: 10351 Log: Tue Oct 14 08:58:12 EDT 2008 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * nua/check_register.c: Increased test timeouts to 10 seconds This prevents occasional test timeout errors in Maemo Scratchbox. Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Wed Nov 12 06:59:09 2008 @@ -717,7 +717,7 @@ tcase_add_test(tc, register_1_3_2_1); tcase_add_test(tc, register_1_3_2_2); } - tcase_set_timeout(tc, 5); + tcase_set_timeout(tc, 10); return tc; } @@ -729,7 +729,7 @@ { tcase_add_test(tc, register_1_3_3_1); } - tcase_set_timeout(tc, 5); + tcase_set_timeout(tc, 10); return tc; }

1 0

[commit] r10350 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:58:43 2008 New Revision: 10350 Log: Tue Oct 2 11:30:47 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * outbound.c: Retain keepalives even when 'natify' is disabled Mon Oct 6 09:02:14 EDT 2008 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * Resolved a conflict in outbound.c with the natify patch Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Nov 12 06:58:43 2008 @@ -1 +1 @@ -Wed Nov 12 11:22:49 EST 2008 +Wed Nov 12 11:25:43 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Wed Nov 12 06:58:43 2008 @@ -669,7 +669,7 @@ udp = ob->ob_via && ob->ob_via->v_protocol == sip_transport_udp; - if (ob->ob_prefs.natify && + if (/* ob->ob_prefs.natify && */ /* On UDP, use OPTIONS keepalive by default */ (udp ? ob->ob_prefs.okeepalive != 0 /* Otherwise, only if requested */

1 0

[commit] r10348 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:55:47 2008 New Revision: 10348 Log: Tue Oct 2 10:51:22 EDT 2007 Mikhail Zabaluev <mikhail.zabaluev(a)nokia.com> * outbound.c: Do keepalives even when no NAT was detected Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Wed Nov 12 06:55:47 2008 @@ -1 +1 @@ -Mon Oct 6 17:52:55 EDT 2008 +Wed Nov 12 11:22:49 EST 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/outbound.c Wed Nov 12 06:55:47 2008 @@ -677,7 +677,7 @@ interval = ob->ob_prefs.interval; need_to_validate = ob->ob_prefs.validate && !ob->ob_validated; - if (!ob->ob_nat_detected || !register_transaction || + if (!register_transaction || !(need_to_validate || interval != 0)) { outbound_stop_keepalive(ob); return;

1 0

[commit] r10347 - freeswitch/trunk/src/mod/applications/mod_commands
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mikej Date: Wed Nov 12 06:46:44 2008 New Revision: 10347 Log: (FSCORE-217) Add support for passing the cause of hangup to the uuid_kill command Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 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 Nov 12 06:46:44 2008 @@ -921,26 +921,39 @@ return SWITCH_STATUS_SUCCESS; } -#define KILL_SYNTAX "<uuid>" +#define KILL_SYNTAX "<uuid> [cause]" SWITCH_STANDARD_API(kill_function) { switch_core_session_t *ksession = NULL; + char *mycmd = NULL, *kcause = NULL; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; if (session) { return SWITCH_STATUS_FALSE; } - if (!cmd) { + if (switch_strlen_zero(cmd) || !(mycmd = strdup(cmd))) { stream->write_function(stream, "-USAGE: %s\n", KILL_SYNTAX); - } else if ((ksession = switch_core_session_locate(cmd))) { + return SWITCH_STATUS_SUCCESS; + } + + if ((kcause = strchr(mycmd, ' '))) { + *kcause++ = '\0'; + } + + if (switch_strlen_zero(mycmd) || !(ksession = switch_core_session_locate(mycmd))) { + stream->write_function(stream, "-ERR No Such Channel!\n"); + } else { switch_channel_t *channel = switch_core_session_get_channel(ksession); - switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); + if (!switch_strlen_zero(kcause)){ + cause = switch_channel_str2cause(kcause); + } + switch_channel_hangup(channel, cause); switch_core_session_rwunlock(ksession); stream->write_function(stream, "+OK\n"); - } else { - stream->write_function(stream, "-ERR No Such Channel!\n"); } + switch_safe_free(mycmd); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r10346 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 06:44:13 2008 New Revision: 10346 Log: possible fix for FSCORE-221 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_media_bug.c freeswitch/trunk/src/switch_core_session.c freeswitch/trunk/src/switch_ivr_async.c Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Nov 12 06:44:13 2008 @@ -212,6 +212,9 @@ */ SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(_In_ switch_media_bug_t *bug, _In_ switch_frame_t *frame); +SWITCH_DECLARE(void) switch_core_media_bug_flush(_In_ switch_media_bug_t *bug); +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(_In_ switch_core_session_t *session); + ///\} ///\defgroup pa1 Port Allocation Modified: freeswitch/trunk/src/switch_core_media_bug.c ============================================================================== --- freeswitch/trunk/src/switch_core_media_bug.c (original) +++ freeswitch/trunk/src/switch_core_media_bug.c Wed Nov 12 06:44:13 2008 @@ -76,6 +76,12 @@ return bug->user_data; } +SWITCH_DECLARE(void) switch_core_media_bug_flush(switch_media_bug_t *bug) +{ + switch_buffer_zero(bug->raw_read_buffer); + switch_buffer_zero(bug->raw_write_buffer); +} + SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame) { uint32_t bytes = 0; @@ -265,9 +271,27 @@ } +SWITCH_DECLARE(switch_status_t) switch_core_media_bug_flush_all(switch_core_session_t *session) +{ + switch_media_bug_t *bp; + + if (session->bugs) { + switch_thread_rwlock_wrlock(session->bug_rwlock); + for (bp = session->bugs; bp; bp = bp->next) { + switch_core_media_bug_flush(bp); + } + switch_thread_rwlock_unlock(session->bug_rwlock); + return SWITCH_STATUS_SUCCESS; + } + + return SWITCH_STATUS_FALSE; +} + + SWITCH_DECLARE(switch_status_t) switch_core_media_bug_remove_all(switch_core_session_t *session) { switch_media_bug_t *bp; + switch_status_t status = SWITCH_STATUS_FALSE; if (session->bugs) { switch_thread_rwlock_wrlock(session->bug_rwlock); @@ -285,7 +309,7 @@ } session->bugs = NULL; switch_thread_rwlock_unlock(session->bug_rwlock); - return SWITCH_STATUS_SUCCESS; + status = SWITCH_STATUS_SUCCESS; } if (session->bug_codec.implementation) { @@ -293,7 +317,7 @@ memset(&session->bug_codec, 0, sizeof(session->bug_codec)); } - return SWITCH_STATUS_FALSE; + return status; } SWITCH_DECLARE(switch_status_t) switch_core_media_bug_close(switch_media_bug_t **bug) Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Wed Nov 12 06:44:13 2008 @@ -742,6 +742,7 @@ switch_clear_flag(session, SSF_WARN_TRANSCODE); switch_ivr_deactivate_unicast(session); switch_channel_clear_flag(channel, CF_BREAK); + switch_core_media_bug_flush_all(session); } Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Nov 12 06:44:13 2008 @@ -913,22 +913,18 @@ static switch_bool_t inband_dtmf_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type) { switch_inband_dtmf_t *pvt = (switch_inband_dtmf_t *) user_data; - uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE]; - switch_frame_t frame = { 0 }; + switch_frame_t *frame = NULL; char digit_str[80]; switch_channel_t *channel = switch_core_session_get_channel(pvt->session); - frame.data = data; - frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; - switch (type) { case SWITCH_ABC_TYPE_INIT: break; case SWITCH_ABC_TYPE_CLOSE: break; - case SWITCH_ABC_TYPE_READ: - if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { - teletone_dtmf_detect(&pvt->dtmf_detect, frame.data, frame.samples); + case SWITCH_ABC_TYPE_READ_REPLACE: + if ((frame = switch_core_media_bug_get_read_replace_frame(bug))) { + teletone_dtmf_detect(&pvt->dtmf_detect, frame->data, frame->samples); teletone_dtmf_get(&pvt->dtmf_detect, digit_str, sizeof(digit_str)); if (digit_str[0]) { char *p = digit_str; @@ -941,6 +937,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str); } + switch_core_media_bug_set_read_replace_frame(bug, frame); } break; case SWITCH_ABC_TYPE_WRITE: @@ -984,7 +981,7 @@ switch_channel_pre_answer(channel); - if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { + if ((status = switch_core_media_bug_add(session, inband_dtmf_callback, pvt, 0, SMBF_READ_REPLACE, &bug)) != SWITCH_STATUS_SUCCESS) { return status; }

1 0

[commit] r10345 - freeswitch/trunk/src/mod/languages/mod_perl
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: mikej Date: Wed Nov 12 06:29:33 2008 New Revision: 10345 Log: make mod_perl load global Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Wed Nov 12 06:29:33 2008 @@ -46,7 +46,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_perl_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_perl_shutdown); -SWITCH_MODULE_DEFINITION(mod_perl, mod_perl_load, mod_perl_shutdown, NULL); +SWITCH_MODULE_DEFINITION_EX(mod_perl, mod_perl_load, mod_perl_shutdown, NULL, SMODF_GLOBAL_SYMBOLS); static STRLEN n_a;

1 0

[commit] r10344 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: brian Date: Wed Nov 12 06:16:23 2008 New Revision: 10344 Log: disable 100rel by default Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Wed Nov 12 06:16:23 2008 @@ -26,6 +26,7 @@ <param name="hold-music" value="$${hold_music}"/> <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> + <param name="enable-100rel" value="false"/>  <param name="manage-presence" value="false"/> Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed Nov 12 06:16:23 2008 @@ -55,7 +55,7 @@    -  + <param name="enable-100rel" value="false"/>  <param name="apply-inbound-acl" value="domains"/>

1 0

[commit] r10343 - freeswitch/trunk/src
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: anthm Date: Wed Nov 12 05:42:55 2008 New Revision: 10343 Log: fix compiler warning in msvc 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 Nov 12 05:42:55 2008 @@ -1257,7 +1257,7 @@ { switch_size_t bytes = 0; switch_status_t status; - uint8_t check = 0; + int check = 0; stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000;

1 0