- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13969 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 18:44:13 2009 New Revision: 13969 Log: more docs Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Thu Jun 25 18:44:13 2009 @@ -55,6 +55,10 @@ <param name="hold-music" value="$${hold_music}"/> <param name="apply-nat-acl" value="rfc1918.auto"/>  +    <param name="apply-inbound-acl" value="domains"/>

1 0

[commit] r13968 - freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 18:21:33 2009 New Revision: 13968 Log: MODEVENT-44 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c Thu Jun 25 18:21:33 2009 @@ -52,6 +52,7 @@ switch_hash_t *template_hash; char *log_dir; char *default_template; + int masterfileonly; int shutdown; int rotate; int debug; @@ -226,7 +227,7 @@ log_line = switch_channel_expand_variables(channel, a_template_str); - if (accountcode) { + if ((accountcode) && (!globals.masterfileonly)) { path = switch_mprintf("%s%s%s.csv", log_dir, SWITCH_PATH_SEPARATOR, accountcode); assert(path); write_cdr(path, log_line); @@ -338,6 +339,8 @@ globals.rotate = switch_true(val); } else if (!strcasecmp(var, "default-template")) { globals.default_template = switch_core_strdup(pool, val); + } else if (!strcasecmp(var, "master-file-only")) { + globals.masterfileonly = switch_true(val); } } }

1 0

[commit] r13967 - in freeswitch/trunk: conf/jingle_profiles src/mod/endpoints/mod_dingaling
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 16:38:44 2009 New Revision: 13967 Log: adding auto-nat options to dingaling Modified: freeswitch/trunk/conf/jingle_profiles/client.xml freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Modified: freeswitch/trunk/conf/jingle_profiles/client.xml ============================================================================== --- freeswitch/trunk/conf/jingle_profiles/client.xml (original) +++ freeswitch/trunk/conf/jingle_profiles/client.xml Thu Jun 25 16:38:44 2009 @@ -9,7 +9,7 @@ <param name="context" value="public"/> <param name="message" value="Jingle all the way"/> <param name="rtp-ip" value="$${bind_server_ip}"/> -  +  <param name="auto-login" value="true"/>  <param name="sasl" value="plain"/> @@ -27,5 +27,6 @@ <param name="vad" value="both"/>   + <param name="local-network-acl" value="localnet.auto"/> </x-profile> </include> Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jun 25 16:38:44 2009 @@ -104,7 +104,7 @@ switch_event_node_t *probe_node; switch_event_node_t *out_node; switch_event_node_t *roster_node; - + int auto_nat; } globals; struct mdl_profile { @@ -135,6 +135,7 @@ uint32_t user_flags; char *acl[MAX_ACL]; uint32_t acl_count; + char *local_network; }; typedef struct mdl_profile mdl_profile_t; @@ -841,6 +842,12 @@ switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec); switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec); + if(globals.auto_nat && tech_pvt->profile->local_network && + !switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network)) { + switch_port_t external_port = 0; + switch_nat_add_mapping((switch_port_t)tech_pvt->local_port, SWITCH_NAT_UDP, &external_port); + tech_pvt->local_port = external_port; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip, tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port); @@ -1194,6 +1201,11 @@ tech_pvt->rtp_session = NULL; } + if(globals.auto_nat && tech_pvt->profile->local_network && + !switch_check_network_list_ip(tech_pvt->remote_ip, tech_pvt->profile->local_network)) { + switch_nat_del_mapping((switch_port_t)tech_pvt->local_port, SWITCH_NAT_UDP); + } + if (switch_core_codec_ready(&tech_pvt->read_codec)) { switch_core_codec_destroy(&tech_pvt->read_codec); } @@ -1943,10 +1955,22 @@ profile->name = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "message") && !switch_strlen_zero(val)) { profile->message = switch_core_strdup(module_pool, val); + } else if (!strcasecmp(var, "local-network-acl")) { + profile->local_network = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "rtp-ip")) { profile->ip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip); } else if (!strcasecmp(var, "ext-rtp-ip")) { - profile->extip = switch_core_strdup(module_pool, strcasecmp(switch_str_nil(val), "auto") ? switch_str_nil(val) : globals.guess_ip); + char *ip = globals.guess_ip; + if (!strcasecmp(val, "auto-nat")) { + ip = globals.auto_nat ? switch_core_get_variable("nat_public_addr") : globals.guess_ip; + } else if (strcasecmp(val, "auto")) { + globals.auto_nat = 0; + ip = globals.guess_ip; + } else { + globals.auto_nat = 0; + ip = switch_strlen_zero(val) ? globals.guess_ip : val; + } + profile->extip = switch_core_strdup(module_pool, ip); } else if (!strcasecmp(var, "server") && !switch_strlen_zero(val)) { profile->server = switch_core_strdup(module_pool, val); } else if (!strcasecmp(var, "rtp-timer-name") && !switch_strlen_zero(val)) { @@ -2184,6 +2208,7 @@ memset(&globals, 0, sizeof(globals)); globals.running = 1; + globals.auto_nat = (switch_core_get_variable("nat_type") ? 1 : 0); switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), NULL, AF_INET);

1 0

[commit] r13966 - freeswitch/trunk/libs/esl/php
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

1 0

[commit] r13965 - freeswitch/trunk/src
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 14:50:00 2009 New Revision: 13965 Log: make session.ready work on uninit session containers Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Thu Jun 25 14:50:00 2009 @@ -874,7 +874,12 @@ SWITCH_DECLARE(bool) CoreSession::ready() { this_check(false); - sanity_check(false); + + if (!session) { + return false; + } + sanity_check(false); + return switch_channel_ready(channel) != 0; }

1 0

[commit] r13964 - in freeswitch/trunk: libs/esl src
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: brian Date: Thu Jun 25 14:29:34 2009 New Revision: 13964 Log: FSCORE-389 Modified: freeswitch/trunk/libs/esl/fs_cli.c freeswitch/trunk/src/switch_console.c Modified: freeswitch/trunk/libs/esl/fs_cli.c ============================================================================== --- freeswitch/trunk/libs/esl/fs_cli.c (original) +++ freeswitch/trunk/libs/esl/fs_cli.c Thu Jun 25 14:29:34 2009 @@ -720,6 +720,7 @@ el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); + el_source(el, NULL); #endif #ifdef WIN32 Modified: freeswitch/trunk/src/switch_console.c ============================================================================== --- freeswitch/trunk/src/switch_console.c (original) +++ freeswitch/trunk/src/switch_console.c Thu Jun 25 14:29:34 2009 @@ -802,6 +802,8 @@ el_set(el, EL_HIST, history, myhistory); history(myhistory, &ev, H_LOAD, hfile); + el_source(el, NULL); + switch_threadattr_create(&thd_attr, pool); switch_threadattr_detach_set(thd_attr, 1); switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE);

1 0

[commit] r13963 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: anthm Date: Thu Jun 25 13:56:37 2009 New Revision: 13963 Log: unhold before media timeout 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 Thu Jun 25 13:56:37 2009 @@ -385,7 +385,7 @@ } else { switch_snprintf(reason, sizeof(reason), "FreeSWITCH;cause=%d;text=\"%s\"", cause, switch_channel_cause2str(cause)); } - + if (switch_channel_test_flag(channel, CF_ANSWERED)) { if (!tech_pvt->got_bye) { switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye"); @@ -620,6 +620,10 @@ status = switch_rtp_zerocopy_read_frame(tech_pvt->video_rtp_session, &tech_pvt->video_read_frame, flags); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { if (status == SWITCH_STATUS_TIMEOUT) { + if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + sofia_glue_toggle_hold(tech_pvt, 0); + sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + } switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); } return status; @@ -728,6 +732,12 @@ if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { if (status == SWITCH_STATUS_TIMEOUT) { + + if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) { + sofia_glue_toggle_hold(tech_pvt, 0); + sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD); + } + switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_MEDIA_TIMEOUT); } return status;

1 0

[commit] r13962 - freeswitch/trunk/contrib/jmesquita/mod_khomp
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: raulfragoso Date: Thu Jun 25 13:54:28 2009 New Revision: 13962 Log: removed the (unnecessary) check for the VOICE flag when reading frames Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Modified: freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp ============================================================================== --- freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp (original) +++ freeswitch/trunk/contrib/jmesquita/mod_khomp/mod_khomp.cpp Thu Jun 25 13:54:28 2009 @@ -364,8 +364,8 @@ return SWITCH_STATUS_FALSE; } - if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { - switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); + //if (switch_test_flag(tech_pvt, TFLAG_IO) && switch_test_flag(tech_pvt, TFLAG_VOICE)) { + // switch_clear_flag_locked(tech_pvt, TFLAG_VOICE); if (!tech_pvt->read_frame.datalen) { continue; } @@ -376,7 +376,7 @@ } #endif return SWITCH_STATUS_SUCCESS; - } + //} switch_cond_next(); }

1 0

[commit] r13961 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 13:47:15 2009 New Revision: 13961 Log: Thu Jun 25 12:35:25 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: test for 200 response to BYE left unreplied by application Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 25 13:47:15 2009 @@ -1 +1 @@ -Thu Jun 25 13:44:49 CDT 2009 +Thu Jun 25 13:46:21 CDT 2009 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 Thu Jun 25 13:47:15 2009 @@ -2414,7 +2414,7 @@ fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); - fail_unless(s2_sip_check_response(500, SIP_METHOD_BYE)); + fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE)); } END_TEST

1 0

[commit] r13960 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 25 Jun '09

25 Jun '09

Author: mikej Date: Thu Jun 25 13:46:14 2009 New Revision: 13960 Log: Thu Jun 25 12:25:56 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: check correct non-support for 100rel Thu Jun 25 12:26:46 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * nua_session.c: if 100rel is not supported by nua, do not Require it in response Thu Jun 25 12:33:45 CDT 2009 Pekka Pessi <first.last(a)nokia.com> * check_session.c: cleaned test for SFSIP-125 Fixes SFSIP-125 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Thu Jun 25 13:46:14 2009 @@ -1 +1 @@ -Thu Jun 25 13:43:44 CDT 2009 +Thu Jun 25 13:44:49 CDT 2009 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 Thu Jun 25 13:46:14 2009 @@ -1408,6 +1408,95 @@ } END_TEST +START_TEST(call_2_4_3) +{ + struct message *response; + + S2_CASE("2.4.3", "Call without 100rel", + "NUA receives INVITE with Required: 100rel, " + "rejects it with 420"); + + nua_set_params(s2->nua, + SIPTAG_SUPPORTED(SIP_NONE), + SIPTAG_SUPPORTED_STR("timer"), + TAG_END()); + fail_unless_event(nua_r_set_params, 200); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, + SIPTAG_REQUIRE_STR("100rel"), + TAG_END()); + + response = s2_sip_wait_for_response(420, SIP_METHOD_INVITE); + fail_if(!response); + fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); +} +END_TEST + +START_TEST(call_2_4_4) +{ + nua_handle_t *nh; + struct event *invite; + struct message *response; + + S2_CASE("2.4.3", "Call without 100rel", + "NUA receives INVITE with Supported: 100rel, " + "proceeds normally"); + + nua_set_params(s2->nua, + SIPTAG_SUPPORTED(SIP_NONE), + SIPTAG_SUPPORTED_STR("timer"), + TAG_END()); + fail_unless_event(nua_r_set_params, 200); + + soa_generate_offer(soa, 1, NULL); + request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, + SIPTAG_SUPPORTED_STR("100rel"), + TAG_END()); + + invite = s2_wait_for_event(nua_i_invite, 100); fail_unless(invite != NULL); + fail_unless(s2_check_callstate(nua_callstate_received)); + + nh = invite->nh; fail_if(!nh); + + s2_free_event(invite); + + response = s2_sip_wait_for_response(100, SIP_METHOD_INVITE); + fail_if(!response); + + nua_respond(nh, SIP_183_SESSION_PROGRESS, + SOATAG_USER_SDP_STR("m=audio 5004 RTP/AVP 0 8"), + TAG_END()); + fail_unless(s2_check_callstate(nua_callstate_early)); + + response = s2_sip_wait_for_response(183, SIP_METHOD_INVITE); + fail_if(!response); + fail_if(response->sip->sip_require); + s2_sip_update_dialog(dialog, response); + process_answer(response); + s2_sip_free_message(response); + + nua_respond(nh, SIP_200_OK, TAG_END()); + + fail_unless(s2_check_callstate(nua_callstate_completed)); + + response = s2_sip_wait_for_response(200, SIP_METHOD_INVITE); + fail_if(!response); + s2_sip_update_dialog(dialog, response); + s2_sip_free_message(response); + + fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); + + fail_unless_event(nua_i_ack, 200); + fail_unless(s2_check_callstate(nua_callstate_ready)); + + bye_to_nua(nh, TAG_END()); + + nua_handle_destroy(nh); +} +END_TEST + + TCase *invite_100rel_tcase(int threading) { TCase *tc = tcase_create("2.4 - INVITE with 100rel"); @@ -1415,6 +1504,8 @@ { tcase_add_test(tc, call_2_4_1); tcase_add_test(tc, call_2_4_2); + tcase_add_test(tc, call_2_4_3); + tcase_add_test(tc, call_2_4_4); } return tc; } Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Thu Jun 25 13:46:14 2009 @@ -2409,6 +2409,8 @@ if (require == NULL && supported == NULL) return 0; + if (!sip_has_feature(NH_PGET(nh, supported), "100rel")) + return 0; if (sip_has_feature(require, "100rel")) return 1; if (!sip_has_feature(supported, "100rel"))

1 0