- Freeswitch-svn - FreeSWITCH Mailing Lists

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

12 Nov '08

Author: mikej Date: Wed Nov 12 08:41:18 2008 New Revision: 10356 Log: better error message. 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 Nov 12 08:41:18 2008 @@ -56,7 +56,7 @@ file_path = rhs + 3; } else { if ((ext = strrchr(file_path, '.')) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Format\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unknown file Format [%s]\n", file_path); return SWITCH_STATUS_FALSE; } ext++;

1 0

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

12 Nov '08

Author: brian Date: Wed Nov 12 08:03:08 2008 New Revision: 10355 Log: line up with upcomming commit 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 08:03:08 2008 @@ -26,7 +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 08:03:08 2008 @@ -55,7 +55,7 @@    - <param name="enable-100rel" value="false"/> +   <param name="apply-inbound-acl" value="domains"/>

1 0

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

12 Nov '08

Author: mikej Date: Wed Nov 12 08:02:44 2008 New Revision: 10354 Log: disable 100rel by default. NOTE: Potentially breaking change, check your configs. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.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 Wed Nov 12 08:02:44 2008 @@ -1422,6 +1422,7 @@ profile->mflags = MFLAG_REFER | MFLAG_REGISTER; profile->rport_level = 1; profile->pflags |= PFLAG_STUN_ENABLED; + profile->pflags |= PFLAG_DISABLE_100REL; for (param = switch_xml_child(settings, "param"); param; param = param->next) { char *var = (char *) switch_xml_attr_soft(param, "name"); @@ -1705,8 +1706,8 @@ profile->minimum_session_expires = 90; } } else if (!strcasecmp(var, "enable-100rel")) { - if (!switch_true(val)) { - profile->pflags |= PFLAG_DISABLE_100REL; + if (switch_true(val)) { + profile->pflags &= ~PFLAG_DISABLE_100REL; } } else if (!strcasecmp(var, "bitpacking")) { if (!strcasecmp(val, "aal2")) {

1 0

[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] r10349 - freeswitch/branches/gmaruzz/src/mod/endpoints/mod_skypiax
by FreeSWITCH SVN 12 Nov '08

12 Nov '08

Author: gmaruzz Date: Wed Nov 12 06:57:47 2008 New Revision: 10349 Log: skypiax: trying to send DTMF from incoming skype to IVR 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 Wed Nov 12 06:57:47 2008 @@ -173,6 +173,7 @@ //int phonebook_text_lenght; FILE *phonebook_writing_fp; int skypiax_dir_entry_extension_prefix; + void *tech_pvt; }; typedef struct skypiax_config skypiax_config_t; @@ -645,8 +646,11 @@ switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_core_session_set_private(session, tech_pvt); tech_pvt->session = session; - if(p) + if(p){ tech_pvt->p=p; + p->tech_pvt=tech_pvt; + + } if ( skypiax_codec(tech_pvt, 8000, 20) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "skypiax_docec FAILED\n"); @@ -897,7 +901,7 @@ int sent; struct skypiax_config *p=NULL; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL WRITE FRAME\n"); + //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL WRITE FRAME\n"); channel = switch_core_session_get_channel(session); assert(channel != NULL); @@ -919,7 +923,7 @@ #endif sent = write(p->audioskypepipe[1], (short *) frame->data, frame->datalen); - ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); + //ERRORA("sent %d\n", SKYPIAX_P_LOG, sent); return SWITCH_STATUS_SUCCESS; @@ -1579,8 +1583,31 @@ } if (!strcasecmp(prop, "DTMF")) { + switch_core_session_t *session = NULL; + private_t *tech_pvt = NULL; + switch_channel_t *channel = NULL; + //FIXME struct ast_frame f2 = { AST_FRAME_DTMF, value[0], }; DEBUGA_SKYPE("Call %s received a DTMF: %s\n", SKYPIAX_P_LOG, id, value); + + tech_pvt = p->tech_pvt; + session = tech_pvt->session; + channel = switch_core_session_get_channel(session); + + + + if (channel) { + switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) }; + if (globals.debug) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", dtmf.digit, switch_channel_get_name(channel)); + } + switch_mutex_lock(tech_pvt->flag_mutex); + switch_channel_queue_dtmf(channel, &dtmf); + switch_set_flag(tech_pvt, TFLAG_DTMF); + switch_mutex_unlock(tech_pvt->flag_mutex); + } + + //FIXME ast_queue_frame(p->owner, &f2); }

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