- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8509 - freeswitch/trunk/src
by Freeswitch SVN 21 May '08

21 May '08

Author: mikej Date: Wed May 21 16:32:51 2008 New Revision: 8509 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: handle NULL values better. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed May 21 16:32:51 2008 @@ -735,15 +735,18 @@ dup = switch_core_session_strdup(session, alt); engine = dup; - if ((voice = strchr(engine, ':'))) { - *voice++ = '\0'; - if ((text = strchr(voice, ':'))) { - *text++ = '\0'; + if (!switch_strlen_zero(engine)) { + if ((voice = strchr(engine, ':'))) { + *voice++ = '\0'; + if (!switch_strlen_zero(voice) && (text = strchr(voice, ':'))) { + *text++ = '\0'; + } } } - if (engine && voice && text) { + + if (!switch_strlen_zero(engine) && !switch_strlen_zero(voice) && !switch_strlen_zero(text)) { return switch_ivr_speak_text(session, engine, voice, text, args); - } else if (engine && !(voice && text)) { + } else if (!switch_strlen_zero(engine) && !(voice && text)) { text = engine; engine = (char *)switch_channel_get_variable(channel, "tts_engine"); voice = (char *)switch_channel_get_variable(channel, "tts_voice");

1 0

[commit] r8508 - freeswitch/trunk/src
by Freeswitch SVN 21 May '08

21 May '08

Author: mikej Date: Wed May 21 16:25:40 2008 New Revision: 8508 Modified: freeswitch/trunk/src/switch_ivr_play_say.c Log: handle allocation error. Found by Klockwork (www.klocwork.com) Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Wed May 21 16:25:40 2008 @@ -1386,6 +1386,9 @@ char *tp; switch_size_t mylen = strlen(text) + extra + 1; tmp = malloc(mylen); + if (!tmp) { + return SWITCH_STATUS_MEMERR; + } memset(tmp, 0, mylen); tp = tmp; for (p = text; p && *p; p++) {

1 0

[commit] r8507 - freeswitch/trunk/src/mod/xml_int/mod_xml_cdr
by Freeswitch SVN 21 May '08

21 May '08

Author: stkn Date: Wed May 21 16:05:46 2008 New Revision: 8507 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: sizeof does not work for dynamically allocated memory (Klocwork #532) Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Wed May 21 16:05:46 2008 @@ -130,7 +130,7 @@ xml_text_escaped = malloc(need_bytes); switch_assert(xml_text_escaped); - memset(xml_text_escaped, 0, sizeof(xml_text_escaped)); + memset(xml_text_escaped, 0, need_bytes); if (globals.encode == 1) { headers = curl_slist_append(headers, "Content-Type: application/x-www-form-urlencoded"); switch_url_encode(xml_text, xml_text_escaped, need_bytes - 1);

1 0

[commit] r8506 - freeswitch/trunk/src
by Freeswitch SVN 21 May '08

21 May '08

Author: anthm Date: Wed May 21 16:00:00 2008 New Revision: 8506 Modified: freeswitch/trunk/src/switch_channel.c Log: tweak Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Wed May 21 16:00:00 2008 @@ -130,9 +130,10 @@ uint8_t x; const char *str = "UNKNOWN"; - for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) ; x++) { + for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) -1 ; x++) { if (CAUSE_CHART[x].cause == cause) { str = CAUSE_CHART[x].name; + break; } } @@ -147,9 +148,10 @@ if (*str > 47 && *str < 58) { cause = atoi(str); } else { - for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) && CAUSE_CHART[x].name; x++) { + for (x = 0; x < (sizeof(CAUSE_CHART) / sizeof(struct switch_cause_table)) - 1 && CAUSE_CHART[x].name; x++) { if (!strcasecmp(CAUSE_CHART[x].name, str)) { cause = CAUSE_CHART[x].cause; + break; } } }

1 0

[commit] r8505 - freeswitch/trunk/src/mod/endpoints/mod_woomera
by Freeswitch SVN 21 May '08

21 May '08

Author: stkn Date: Wed May 21 15:54:23 2008 New Revision: 8505 Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Log: Make woomera_printf() a little more robust (Klocwork #530 related) Modified: freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_woomera/mod_woomera.c Wed May 21 15:54:23 2008 @@ -471,7 +471,7 @@ static void woomera_printf(woomera_profile * profile, switch_socket_t * socket, char *fmt, ...) { - char *stuff; + char *stuff = NULL; size_t res = 0, len = 0; va_list ap; @@ -479,13 +479,13 @@ #ifndef vasprintf stuff = (char *) malloc(10240); switch_assert(stuff); - vsnprintf(stuff, 10240, fmt, ap); + res = vsnprintf(stuff, 10240, fmt, ap); #else res = vasprintf(&stuff, fmt, ap); switch_assert(stuff); #endif va_end(ap); - if (res == -1) { + if (res < 0) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Out of memory\n"); } else { if (profile && globals.debug) { @@ -494,10 +494,11 @@ } len = strlen(stuff); switch_socket_send(socket, stuff, &len); + } + if (stuff) { free(stuff); } - } static char *woomera_message_header(woomera_message * wmsg, char *key)

1 0

[commit] r8504 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 21 May '08

21 May '08

Author: brian Date: Wed May 21 14:15:56 2008 New Revision: 8504 Modified: freeswitch/trunk/conf/sip_profiles/external.xml freeswitch/trunk/conf/sip_profiles/nat.xml Log: update the config for aggressive-nat-detection param Modified: freeswitch/trunk/conf/sip_profiles/external.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/external.xml (original) +++ freeswitch/trunk/conf/sip_profiles/external.xml Wed May 21 14:15:56 2008 @@ -26,6 +26,7 @@ <param name="use-rtp-timer" value="true"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="false"/> + <param name="aggressive-nat-detection" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> <param name="auth-calls" value="false"/> Modified: freeswitch/trunk/conf/sip_profiles/nat.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/nat.xml (original) +++ freeswitch/trunk/conf/sip_profiles/nat.xml Wed May 21 14:15:56 2008 @@ -17,6 +17,7 @@ <param name="hold-music" value="$${hold_music}"/> <param name="rtp-timer-name" value="soft"/> <param name="manage-presence" value="false"/> + <param name="aggressive-nat-detection" value="true"/> <param name="inbound-codec-negotiation" value="generous"/> <param name="nonce-ttl" value="60"/> <param name="auth-calls" value="false"/>

1 0

[commit] r8503 - freeswitch/trunk/conf/sip_profiles
by Freeswitch SVN 21 May '08

21 May '08

Author: brian Date: Wed May 21 14:14:57 2008 New Revision: 8503 Modified: freeswitch/trunk/conf/sip_profiles/internal.xml Log: update the config for aggressive-nat-detection param Modified: freeswitch/trunk/conf/sip_profiles/internal.xml ============================================================================== --- freeswitch/trunk/conf/sip_profiles/internal.xml (original) +++ freeswitch/trunk/conf/sip_profiles/internal.xml Wed May 21 14:14:57 2008 @@ -36,6 +36,7 @@ <param name="sip-ip" value="$${local_ip_v4}"/> <param name="hold-music" value="$${hold_music}"/> <param name="apply-nat-acl" value="rfc1918"/> + <param name="aggressive-nat-detection" value="true"/>

1 0

[commit] r8502 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 May '08

21 May '08

Author: anthm Date: Wed May 21 12:46:48 2008 New Revision: 8502 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: next chapter in the never-ending nat saga 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 Wed May 21 12:46:48 2008 @@ -1856,7 +1856,7 @@ tech_pvt->dest_to = switch_core_session_sprintf(nsession, "sip:%s@%s", dest_to, host); } } - + if (!tech_pvt->dest_to) { tech_pvt->dest_to = tech_pvt->dest; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed May 21 12:46:48 2008 @@ -145,7 +145,8 @@ PFLAG_WORKER_RUNNING = (1 << 17), PFLAG_UNREG_OPTIONS_FAIL = (1 << 18), PFLAG_DISABLE_TIMER = (1 << 19), - PFLAG_DISABLE_100REL = (1 << 20) + PFLAG_DISABLE_100REL = (1 << 20), + PFLAG_AGGRESSIVE_NAT_DETECTION = (1 << 21) } PFLAGS; typedef enum { 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 May 21 12:46:48 2008 @@ -1117,6 +1117,8 @@ switch_set_flag(profile, TFLAG_LATE_NEGOTIATION); } else if (!strcasecmp(var, "inbound-proxy-media") && switch_true(val)) { switch_set_flag(profile, TFLAG_PROXY_MEDIA); + } else if (!strcasecmp(var, "aggressive-nat-detection") && switch_true(val)) { + profile->pflags |= PFLAG_AGGRESSIVE_NAT_DETECTION; } else if (!strcasecmp(var, "rfc2833-pt")) { profile->te = (switch_payload_t) atoi(val); } else if (!strcasecmp(var, "cng-pt")) { @@ -2647,7 +2649,7 @@ int is_auth = 0, calling_myself = 0; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); int network_port = 0; - char *sticky = NULL, *is_nat = NULL; + char *is_nat = NULL; if (sess_count >= sess_max || !(profile->pflags & PFLAG_RUNNING)) { nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); @@ -2659,12 +2661,24 @@ nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END()); return; } - get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port); - - if (profile->nat_acl_count) { + + if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) { + if (sip && sip->sip_via) { + const char *port = sip->sip_via->v_port; + const char *host = sip->sip_via->v_host; + + if (host && strcmp(network_ip, host)) { + is_nat = "via host"; + } else if (port && atoi(port) != network_port) { + is_nat = "via port"; + } + } + } + + if (!is_nat && profile->nat_acl_count) { uint32_t x = 0; int ok = 1; char *last_acl = NULL; @@ -2687,7 +2701,6 @@ } } } - if (profile->acl_count) { uint32_t x = 0; @@ -2718,7 +2731,6 @@ } } } - if (!is_auth && ((profile->pflags & PFLAG_AUTH_CALLS) || (!(profile->pflags & PFLAG_BLIND_AUTH) && (sip->sip_proxy_authorization || sip->sip_authorization)))) { @@ -2729,22 +2741,18 @@ if (v_event) { switch_event_destroy(&v_event); } - switch_safe_free(sticky); return; } - switch_safe_free(sticky); } is_auth++; } - if (!(sip->sip_contact && sip->sip_contact->m_url)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO CONTACT!\n"); nua_respond(nh, 400, "Missing Contact Header", TAG_END()); return; } - if (!sofia_endpoint_interface || !(session = switch_core_session_request(sofia_endpoint_interface, NULL))) { nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), TAG_END()); return; @@ -2756,6 +2764,8 @@ switch_core_session_destroy(&session); return; } + + switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip); @@ -3189,7 +3199,7 @@ if (is_nat) { switch_set_flag(tech_pvt, TFLAG_NAT); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on acl %s\n", is_nat); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on %s\n", is_nat); switch_channel_set_variable(channel, "sip_nat_detected", "true"); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed May 21 12:46:48 2008 @@ -868,7 +868,7 @@ uint32_t session_timeout = 0; const char *val; const char *rep; - char *sticky; + char *sticky = NULL; rep = switch_channel_get_variable(channel, SOFIA_REPLACES_HEADER); @@ -1001,19 +1001,15 @@ SIPTAG_CONTACT_STR(invite_contact), TAG_END()); - - if (switch_test_flag(tech_pvt, TFLAG_NAT) || - (val = switch_channel_get_variable(channel, "sip-force-contact")) || - ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { + + if (strstr(tech_pvt->dest, ";nat") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) { + switch_set_flag(tech_pvt, TFLAG_NAT); tech_pvt->record_route = switch_core_session_strdup(tech_pvt->session, url_str); sticky = tech_pvt->record_route; session_timeout = SOFIA_NAT_SESSION_TIMEOUT; switch_channel_set_variable(channel, "sip_nat_detected", "true"); } - - - - + /* TODO: We should use the new tags for making an rpid and add profile options to turn this on/off */ if (switch_test_flag(caller_profile, SWITCH_CPF_HIDE_NAME)) { priv = "name"; @@ -1104,7 +1100,6 @@ sofia_glue_tech_patch_sdp(tech_pvt); } - nua_invite(tech_pvt->nh, NUTAG_AUTOANSWER(0), NUTAG_SESSION_TIMER(session_timeout), @@ -1112,6 +1107,7 @@ TAG_IF(!switch_strlen_zero(alert_info), SIPTAG_HEADER_STR(alert_info)), TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)), TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), + TAG_IF(sticky, NUTAG_PROXY(tech_pvt->record_route)), SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str), SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), 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 Wed May 21 12:46:48 2008 @@ -529,10 +529,10 @@ if (!strcasecmp(v_contact_str, "nat-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { if (contact->m_url->url_params) { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>;nat", display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); } else { - switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); + switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>;nat", display, contact->m_url->url_user, network_ip, network_port); } if (strstr(v_contact_str, "tls")) { reg_desc = "Registered(TLSHACK)";

1 0

[commit] r8499 - freeswitch/trunk/src/mod/applications/mod_soundtouch
by Freeswitch SVN 20 May '08

20 May '08

Author: anthm Date: Tue May 20 18:35:01 2008 New Revision: 8499 Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Log: add new param to func Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp (original) +++ freeswitch/trunk/src/mod/applications/mod_soundtouch/mod_soundtouch.cpp Tue May 20 18:35:01 2008 @@ -55,7 +55,7 @@ int literal; }; -static switch_status_t on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf) +static switch_status_t on_dtmf(switch_core_session_t *session, const switch_dtmf_t *dtmf, switch_dtmf_direction_t direction) { switch_media_bug_t *bug;

1 0

[commit] r8498 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 20 May '08

20 May '08

Author: anthm Date: Tue May 20 18:28:34 2008 New Revision: 8498 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: remove useless code jus't erase it 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 May 20 18:28:34 2008 @@ -990,7 +990,7 @@ to_host = switch_channel_get_variable(channel, "sip_to_host"); } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri); - sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0, NULL); + sofia_reg_auth_challange(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0); switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE); } else if (code == 484 && msg->numeric_arg) { const char *to = switch_channel_get_variable(channel, "sip_to_uri"); Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue May 20 18:28:34 2008 @@ -518,7 +518,7 @@ void sofia_presence_mwi_event_handler(switch_event_t *event); void sofia_presence_cancel(void); switch_status_t config_sofia(int reload, char *profile_name); -void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale, const char *new_via); +void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale); auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user); @@ -555,7 +555,7 @@ switch_call_cause_t sofia_glue_sip_cause_to_freeswitch(int status); void sofia_glue_do_xfer_invite(switch_core_session_t *session); uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sip_t const *sip, - sofia_regtype_t regtype, char *key, uint32_t keylen, switch_event_t **v_event, const char *new_via); + sofia_regtype_t regtype, char *key, uint32_t keylen, switch_event_t **v_event); extern switch_endpoint_interface_t *sofia_endpoint_interface; void sofia_presence_set_chat_hash(private_object_t *tech_pvt, sip_t const *sip); switch_status_t sofia_on_hangup(switch_core_session_t *session); @@ -634,4 +634,4 @@ switch_status_t sofia_glue_tech_proxy_remote_addr(private_object_t *tech_pvt); void sofia_presence_event_thread_start(void); void sofia_reg_expire_call_id(sofia_profile_t *profile, const char *call_id); -char *sofia_glue_hack_via(sofia_profile_t *profile, sip_t const *sip, int network_port); + 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 May 20 18:28:34 2008 @@ -2725,11 +2725,7 @@ if (!strcmp(network_ip, profile->sipip) && network_port == profile->sip_port) { calling_myself++; } else { - if (is_nat) { - sticky = switch_mprintf("sip:%s@%s:%d", sip->sip_contact->m_url->url_user, network_ip, network_port); - } - - if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event, sticky)) { + if (sofia_reg_handle_register(nua, profile, nh, sip, REG_INVITE, key, sizeof(key), &v_event)) { if (v_event) { switch_event_destroy(&v_event); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Tue May 20 18:28:34 2008 @@ -463,32 +463,6 @@ } -char *sofia_glue_hack_via(sofia_profile_t *profile, sip_t const *sip, int network_port) -{ - - char *full_via, *p, *new_via = NULL; - - if (sip->sip_via) { - full_via = sip_header_as_string(profile->home, (void *) sip->sip_via); - if ((p = (char *)switch_stristr("rport=", full_via))) { - *p = '\0'; - p--; - } - - p = end_of_p(full_via); - if (*p == ';') { - *p = '\0'; - } - - - new_via = switch_mprintf("%s;rport=%d", full_via, network_port); - su_free(profile->home, full_via); - } - - return new_via; -} - - const char *sofia_glue_get_unknown_header(sip_t const *sip, const char *name) { sip_unknown_t *un; 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 Tue May 20 18:28:34 2008 @@ -269,10 +269,10 @@ } } else { #endif - if (!profile->master_db) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); - return; - } + if (!profile->master_db) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Opening DB %s\n", profile->dbname); + return; + } #ifdef SWITCH_HAVE_ODBC } #endif @@ -381,7 +381,7 @@ } -void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale, const char *new_via) +void sofia_reg_auth_challange(nua_t *nua, sofia_profile_t *profile, nua_handle_t *nh, sofia_regtype_t regtype, const char *realm, int stale) { switch_uuid_t uuid; char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1]; @@ -403,12 +403,10 @@ if (regtype == REG_REGISTER) { nua_respond(nh, SIP_401_UNAUTHORIZED, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), TAG_IF(nua, NUTAG_WITH_THIS(nua)), SIPTAG_WWW_AUTHENTICATE_STR(auth_str), TAG_END()); } else if (regtype == REG_INVITE) { nua_respond(nh, SIP_407_PROXY_AUTH_REQUIRED, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), TAG_IF(nua, NUTAG_WITH_THIS(nua)), SIPTAG_PROXY_AUTHENTICATE_STR(auth_str), TAG_END()); } @@ -416,7 +414,7 @@ } uint8_t sofia_reg_handle_register(nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sip_t const *sip, sofia_regtype_t regtype, char *key, - uint32_t keylen, switch_event_t **v_event, const char *new_via) + uint32_t keylen, switch_event_t **v_event) { sip_to_t const *to = NULL; sip_expires_t const *expires = NULL; @@ -532,7 +530,7 @@ !strcasecmp(v_contact_str, "NDLB-connectile-dysfunction") || !strcasecmp(v_contact_str, "NDLB-tls-connectile-dysfunction")) { if (contact->m_url->url_params) { switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s>", - display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); + display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params); } else { switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>", display, contact->m_url->url_user, network_ip, network_port); } @@ -567,12 +565,10 @@ if (auth_res == AUTH_FORBIDDEN) { nua_respond(nh, SIP_403_FORBIDDEN, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), NUTAG_WITH_THIS(nua), TAG_END()); } else { nua_respond(nh, SIP_401_UNAUTHORIZED, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), NUTAG_WITH_THIS(nua), TAG_END()); } return 1; @@ -580,13 +576,13 @@ } if (!authorization || stale) { - sofia_reg_auth_challange(nua, profile, nh, regtype, to_host, stale, new_via); + sofia_reg_auth_challange(nua, profile, nh, regtype, to_host, stale); if (regtype == REG_REGISTER && profile->debug) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Requesting Registration from: [%s@%s]\n", to_user, to_host); } return 1; } - reg: + reg: if (regtype != REG_REGISTER) { return 0; @@ -695,9 +691,9 @@ /* - if (call_id) { - su_free(profile->home, call_id); - } + if (call_id) { + su_free(profile->home, call_id); + } */ if (regtype == REG_REGISTER) { @@ -711,7 +707,6 @@ } nua_respond(nh, SIP_200_OK, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), SIPTAG_CONTACT_STR(new_contact), NUTAG_WITH_THIS(nua), TAG_END()); switch_safe_free(new_contact); if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) { @@ -722,7 +717,6 @@ } else { nua_respond(nh, SIP_200_OK, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), SIPTAG_CONTACT(contact), NUTAG_WITH_THIS(nua), TAG_END()); if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_UNREGISTER) == SWITCH_STATUS_SUCCESS) { @@ -752,7 +746,6 @@ char network_ip[80]; su_addrinfo_t *my_addrinfo = msg_addrinfo(nua_current_request(nua)); sofia_regtype_t type = REG_REGISTER; - char *new_via = NULL; int network_port = 0; get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); @@ -765,38 +758,9 @@ goto end; } - if (profile->nat_acl_count) { - uint32_t x = 0; - int ok = 1; - char *last_acl = NULL; - const char *contact_host = NULL; - - if (sip && sip->sip_contact && sip->sip_contact->m_url) { - contact_host = sip->sip_contact->m_url->url_host; - } - - if (!switch_strlen_zero(contact_host)) { - for (x = 0 ; x < profile->nat_acl_count; x++) { - last_acl = profile->nat_acl[x]; - if (!(ok = switch_check_network_list_ip(contact_host, last_acl))) { - break; - } - } - - if (ok) { - if (sip->sip_via) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on acl %s\n", last_acl); - new_via = sofia_glue_hack_via(profile, sip, network_port); - } - } - } - } - - if (!(profile->mflags & MFLAG_REGISTER)) { nua_respond(nh, SIP_403_FORBIDDEN, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), NUTAG_WITH_THIS(nua), TAG_END()); goto end; } @@ -819,7 +783,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl %s\n", network_ip, profile->reg_acl[x]); nua_respond(nh, SIP_403_FORBIDDEN, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), NUTAG_WITH_THIS(nua), TAG_END()); goto end; } @@ -829,12 +792,11 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Received an invalid packet!\n"); nua_respond(nh, SIP_500_INTERNAL_SERVER_ERROR, - TAG_IF(new_via, SIPTAG_VIA((void *)-1)), TAG_IF(new_via, SIPTAG_VIA_STR(new_via)), TAG_END()); goto end; } - sofia_reg_handle_register(nua, profile, nh, sip, type, key, sizeof(key), &v_event, new_via); + sofia_reg_handle_register(nua, profile, nh, sip, type, key, sizeof(key), &v_event); if (v_event) { switch_event_fire(&v_event); @@ -842,15 +804,14 @@ end: - switch_safe_free(new_via); nua_handle_destroy(nh); } void sofia_reg_handle_sip_r_register(int status, - char const *phrase, - nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sofia_private_t * sofia_private, sip_t const *sip, tagi_t tags[]) + char const *phrase, + nua_t * nua, sofia_profile_t *profile, nua_handle_t * nh, sofia_private_t * sofia_private, sip_t const *sip, tagi_t tags[]) { if (sofia_private && sofia_private->gateway) { switch (status) { @@ -952,7 +913,7 @@ } auth_res_t sofia_reg_parse_auth(sofia_profile_t *profile, sip_authorization_t const *authorization, sip_t const *sip, const char *regstr, - char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user) + char *np, size_t nplen, char *ip, switch_event_t **v_event, long exptime, sofia_regtype_t regtype, const char *to_user) { int indexnum; const char *cur; @@ -1263,7 +1224,7 @@ } } } - end: + end: switch_event_destroy(&params);

1 0