FS-4859

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 161d245ea5792430788731b8ba82f66cc81f6b4e..6d63294e15d875d39648160a0e8b622738e6674e 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -3212,14 +3212,14 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
                                        gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
                                                        sipip,
                                                        sofia_glue_transport_has_tls(gateway->register_transport) ?
-                                                       profile->tls_sip_port : profile->sip_port, params, str_rfc_5626);
+                                                       profile->tls_sip_port : profile->extsipport, params, str_rfc_5626);
 
                                } else {
                                        format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>";
                                        gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
                                                        sipip,
                                                        sofia_glue_transport_has_tls(gateway->register_transport) ?
-                                                       profile->tls_sip_port : profile->sip_port, params);
+                                                       profile->tls_sip_port : profile->extsipport, params);
                                }
                        } else {
                                if (rfc_5626) {
@@ -3227,14 +3227,14 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
                                        gateway->register_contact = switch_core_sprintf(gateway->pool, format, gateway->name,
                                                        sipip,
                                                        sofia_glue_transport_has_tls(gateway->register_transport) ?
-                                                       profile->tls_sip_port : profile->sip_port, params, str_rfc_5626);
+                                                       profile->tls_sip_port : profile->extsipport, params, str_rfc_5626);
 
                                } else {
                                        format = strchr(sipip, ':') ? "<sip:gw+%s@[%s]:%d%s>" : "<sip:gw+%s@%s:%d%s>";
                                        gateway->register_contact = switch_core_sprintf(gateway->pool, format, gateway->name,
                                                        sipip,
                                                        sofia_glue_transport_has_tls(gateway->register_transport) ?
-                                                       profile->tls_sip_port : profile->sip_port, params);
+                                                       profile->tls_sip_port : profile->extsipport, params);
 
                                }
                        }
@@ -3301,14 +3301,14 @@ static void config_sofia_profile_urls(sofia_profile_t * profile)
                profile->public_url = switch_core_sprintf(profile->pool,
                                                                                                  "sip:%s@%s%s%s:%d",
                                                                                                  profile->contact_user,
-                                                                                                 ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", profile->sip_port);
+                                                                                                 ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", profile->extsipport);
        }
 
        if (profile->extsipip && !sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
                char *ipv6 = strchr(profile->extsipip, ':');
                profile->url = switch_core_sprintf(profile->pool,
                                                                                   "sip:%s@%s%s%s:%d",
-                                                                                  profile->contact_user, ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", profile->sip_port);
+                                                                                  profile->contact_user, ipv6 ? "[" : "", profile->extsipip, ipv6 ? "]" : "", profile->extsipport);
                profile->bindurl = switch_core_sprintf(profile->pool, "%s;maddr=%s", profile->url, profile->sipip);
        } else {
                char *ipv6 = strchr(profile->sipip, ':');
@@ -7999,7 +7999,7 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia
                        if (sip->sip_contact->m_url->url_port) {
                                port = atoi(sip->sip_contact->m_url->url_port);
                        } else {
-                               port = sofia_glue_transport_has_tls(transport) ? profile->tls_sip_port : profile->sip_port;
+                               port = sofia_glue_transport_has_tls(transport) ? profile->tls_sip_port : profile->extsipport;
                        }
 
                        ipv6 = strchr(host, ':');

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index 7e1456fbed3127d3ad126d99afde5d425dfd03d4..4ba22c25ddbf13021e4a316b8fc1fc8a7bdf28c0 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -2318,7 +2318,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
                                                                                                                                                   ipv6 ? "[" : "", ip_addr, ipv6 ? "]" : "", tech_pvt->profile->tls_sip_port);
                                } else {
                                        tech_pvt->invite_contact = switch_core_session_sprintf(session, "sip:%s@%s%s%s:%d", contact,
-                                                                                                                                                  ipv6 ? "[" : "", ip_addr, ipv6 ? "]" : "", tech_pvt->profile->sip_port);
+                                                                                                                                                  ipv6 ? "[" : "", ip_addr, ipv6 ? "]" : "", tech_pvt->profile->extsipport);
                                }
                        } else {
                                if (sofia_glue_transport_has_tls(tech_pvt->transport)) {