fix nat issue re: sofia_contact func

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8713 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 7be0b5925c6ccfddffa9439e4c1837f0dfd8d92f..380d10d0873c06e5df3daebb61b430f56e1158a4 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -1055,7 +1055,8 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
                                                                  NUTAG_URL(url_str), SIPTAG_TO_STR(to_str), SIPTAG_FROM_STR(from_str), SIPTAG_CONTACT_STR(invite_contact), TAG_END());
 
 
-               if (strstr(tech_pvt->dest, ";nat") || ((val = switch_channel_get_variable(channel, "sip_sticky_contact")) && switch_true(val))) {
+               if (strstr(tech_pvt->dest, ";nat") || strstr(tech_pvt->dest, ";received") 
+                       || ((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;

diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c
index fcacb44feef218adc95f18b26d77749f077f8da2..08ab7b152d8ea0bdf6961fd3896aa8e93a2795b8 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_reg.c
+++ b/src/mod/endpoints/mod_sofia/sofia_reg.c
@@ -463,11 +463,11 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
                }
 
                if (contact->m_url->url_params) {
-                       switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s>%s%s",
-                                                       display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, received_data, is_nat ? ";nat" : "");
+                       switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s>",
+                                                       display, contact->m_url->url_user, contact_host, new_port, contact->m_url->url_params, received_data, is_nat ? ";nat=yes" : "");
                } else {
-                       switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s>%s%s", display, contact->m_url->url_user, contact_host, new_port,
-                                                       received_data, is_nat ? ";nat" : "");
+                       switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s%s%s>", display, contact->m_url->url_user, contact_host, new_port,
+                                                       received_data, is_nat ? ";nat=yes" : "");
                }
        }
 
@@ -517,10 +517,10 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
                                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>%s;nat",
+                                               switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d;%s%s;nat=yes>",
                                                                                display, contact->m_url->url_user, network_ip, network_port, contact->m_url->url_params, received_data);
                                        } else {
-                                               switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d>%s;nat", display, contact->m_url->url_user, network_ip,
+                                               switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s:%d%s;nat=yes>", display, contact->m_url->url_user, network_ip,
                                                                                network_port, received_data);
                                        }
                                        if (strstr(v_contact_str, "tls")) {