- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13618 - freeswitch/trunk/conf/sip_profiles
by FreeSWITCH SVN 04 Jun '09

04 Jun '09

Author: brian Date: Thu Jun 4 14:58:36 2009 New Revision: 13618 Log: enable auto-nat by default 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 4 14:58:36 2009 @@ -151,8 +151,9 @@ auto - Use guessed ip. auto-nat - Use ip learned from NAT-PMP or UPNP --> -  -  + <param name="ext-rtp-ip" value="auto-nat"/> + <param name="ext-sip-ip" value="auto-nat"/> +  <param name="rtp-timeout-sec" value="300"/> <param name="rtp-hold-timeout-sec" value="1800"/>

1 0

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

04 Jun '09

Author: brian Date: Thu Jun 4 14:04:14 2009 New Revision: 13617 Log: sofia does the right thing... confused with users report of it not working 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 4 14:04:14 2009 @@ -1427,7 +1427,6 @@ if (!switch_channel_test_flag(channel, CF_RING_READY) && !sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { nua_respond(tech_pvt->nh, SIP_180_RINGING, - TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SIPTAG_HEADER_STR(generate_pai_str(session)), TAG_END()); switch_channel_mark_ring_ready(channel); @@ -1504,7 +1503,6 @@ nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), - TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), SIPTAG_HEADER_STR(generate_pai_str(session)), SIPTAG_CONTACT_STR(tech_pvt->reply_contact),

1 0

[commit] r13616 - freeswitch/trunk/src
by FreeSWITCH SVN 04 Jun '09

04 Jun '09

Author: anthm Date: Thu Jun 4 13:56:34 2009 New Revision: 13616 Log: tweak rtp timing stuff 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 Thu Jun 4 13:56:34 2009 @@ -212,6 +212,7 @@ uint32_t cng_count; switch_rtp_bug_flag_t rtp_bugs; switch_rtp_stats_t stats; + int hot_hits; #ifdef ENABLE_ZRTP zrtp_session_t *zrtp_session; @@ -1764,16 +1765,27 @@ if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) && rtp_session->read_pollfd) { if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { - hot_socket = 1; + if (++rtp_session->hot_hits >= 10) { + hot_socket = 1; + } + } else { + rtp_session->hot_hits = 0; } } - if (!hot_socket) { + + if (hot_socket) { + switch_core_timer_sync(&rtp_session->timer); + } else { switch_core_timer_next(&rtp_session->timer); } } recvfrom: + if (!switch_rtp_ready(rtp_session)) { + break; + } + if (!rtp_session->timer.interval && rtp_session->read_pollfd) { poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); } @@ -2101,6 +2113,12 @@ if (do_cng) { uint8_t *data = (uint8_t *) rtp_session->recv_msg.body; + int fdr; + + if ((poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, 1)) == SWITCH_STATUS_SUCCESS) { + goto recvfrom; + } + memset(data, 0, 2); data[0] = 65; rtp_session->recv_msg.header.pt = (uint32_t) rtp_session->cng_pt ? rtp_session->cng_pt : SWITCH_RTP_CNG_PAYLOAD;

1 0

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

04 Jun '09

Author: mrene Date: Thu Jun 4 12:26:05 2009 New Revision: 13615 Log: mod_sofia: Move siptrace to loglevel INFO 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 Thu Jun 4 12:26:05 2009 @@ -1003,9 +1003,9 @@ static void logger(void *logarg, char const *fmt, va_list ap) { if (fmt && ap) { - switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, fmt, ap); + switch_log_vprintf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, fmt, ap); } else if (fmt && !ap) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", fmt); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_INFO, "%s", fmt); } }

1 0

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

04 Jun '09

Author: brian Date: Thu Jun 4 11:53:27 2009 New Revision: 13614 Log: use user_via if we send a 180 or 183 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 4 11:53:27 2009 @@ -1426,7 +1426,10 @@ case SWITCH_MESSAGE_INDICATE_RINGING: if (!switch_channel_test_flag(channel, CF_RING_READY) && !sofia_test_flag(tech_pvt, TFLAG_BYE) && !switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) { - nua_respond(tech_pvt->nh, SIP_180_RINGING, SIPTAG_CONTACT_STR(tech_pvt->reply_contact), SIPTAG_HEADER_STR(generate_pai_str(session)), TAG_END()); + nua_respond(tech_pvt->nh, SIP_180_RINGING, + TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), + SIPTAG_CONTACT_STR(tech_pvt->reply_contact), + SIPTAG_HEADER_STR(generate_pai_str(session)), TAG_END()); switch_channel_mark_ring_ready(channel); } break; @@ -1501,6 +1504,7 @@ nua_respond(tech_pvt->nh, SIP_183_SESSION_PROGRESS, NUTAG_AUTOANSWER(0), + TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)), TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), SIPTAG_HEADER_STR(generate_pai_str(session)), SIPTAG_CONTACT_STR(tech_pvt->reply_contact),

1 0

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

04 Jun '09

Author: brian Date: Thu Jun 4 09:53:23 2009 New Revision: 13613 Log: don't have contact str here either it'll result in double contact headers on unregister Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Jun 4 09:53:23 2009 @@ -85,7 +85,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "UN-Registering %s\n", gateway_ptr->name); nua_unregister(gateway_ptr->nh, NUTAG_URL(gateway_ptr->register_url), - SIPTAG_CONTACT_STR(gateway_ptr->register_contact), NUTAG_REGISTRAR(gateway_ptr->register_proxy), TAG_END()); }

1 0

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

04 Jun '09

Author: brian Date: Thu Jun 4 09:10:31 2009 New Revision: 13612 Log: dont leak this in other cases. Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Jun 4 09:10:31 2009 @@ -342,10 +342,7 @@ NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL()); } gateway_ptr->retry = now + gateway_ptr->retry_seconds; - gateway_ptr->state = REG_STATE_TRYING; - - switch_safe_free(user_via); - + gateway_ptr->state = REG_STATE_TRYING; break; case REG_STATE_FAILED: @@ -374,6 +371,7 @@ if (ostate != gateway_ptr->state) { sofia_reg_fire_custom_gateway_state_event(gateway_ptr); } + switch_safe_free(user_via); } }

1 0

[commit] r13611 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 04 Jun '09

04 Jun '09

Author: rupa Date: Thu Jun 4 08:56:28 2009 New Revision: 13611 Log: honor effective_caller_id_number for CID override Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Thu Jun 4 08:56:28 2009 @@ -1086,7 +1086,10 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "LCR Lookup on %s using profile %s\n", dest, lcr_profile); routes.lookup_number = dest; if (caller_profile) { - routes.cid = (char *) caller_profile->caller_id_number; + routes.cid = (char *) switch_channel_get_variable(channel, "effective_caller_id_number"); + if (!routes.cid) { + routes.cid = (char *) caller_profile->caller_id_number; + } } if (!(routes.profile = locate_profile(lcr_profile))) {

1 0

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

04 Jun '09

Author: brian Date: Thu Jun 4 00:50:16 2009 New Revision: 13610 Log: missed one Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Jun 4 00:50:16 2009 @@ -141,8 +141,10 @@ gw_sub_ptr->expires_str = "0"; } - user_via = sofia_glue_create_external_via(NULL, gateway_ptr->profile, gateway_ptr->register_transport); - + if (sofia_glue_check_nat(gateway_ptr->profile, gateway_ptr->register_proxy)) { + user_via = sofia_glue_create_external_via(NULL, gateway_ptr->profile, gateway_ptr->register_transport); + } + switch (ostate) { case SUB_STATE_NOSUB: break;

1 0

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

04 Jun '09

Author: brian Date: Thu Jun 4 00:48:59 2009 New Revision: 13609 Log: don't need contact here its already set on the nh .. this results on double contact headers on unregister Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Thu Jun 4 00:48:59 2009 @@ -335,7 +335,6 @@ TAG_IF(user_via, SIPTAG_VIA_STR(user_via)), SIPTAG_FROM_STR(gateway_ptr->register_from), SIPTAG_TO_STR(gateway_ptr->register_from), - SIPTAG_CONTACT_STR(gateway_ptr->register_contact), SIPTAG_EXPIRES_STR(gateway_ptr->expires_str), NUTAG_REGISTRAR(gateway_ptr->register_proxy), NUTAG_OUTBOUND("no-options-keepalive"), NUTAG_OUTBOUND("no-validate"), NUTAG_KEEPALIVE(0), TAG_NULL());

1 0