kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-23 11:36:09 +00:00
Code Issues Projects Releases Wiki Activity

FS-4859

Browse Source
This commit is contained in:
Anthony Minessale 2012-12-07 10:29:44 -06:00
parent c8e9688265
commit 1cebb320f8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -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, gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
sipip, sipip,
sofia_glue_transport_has_tls(gateway->register_transport) ? 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 { } else {
format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>"; format = strchr(sipip, ':') ? "<sip:%s@[%s]:%d%s>" : "<sip:%s@%s:%d%s>";
gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension, gateway->register_contact = switch_core_sprintf(gateway->pool, format, extension,
sipip, sipip,
sofia_glue_transport_has_tls(gateway->register_transport) ? sofia_glue_transport_has_tls(gateway->register_transport) ?
profile->tls_sip_port : profile->sip_port, params); profile->tls_sip_port : profile->extsipport, params);
} }
} else { } else {
if (rfc_5626) { 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, gateway->register_contact = switch_core_sprintf(gateway->pool, format, gateway->name,
sipip, sipip,
sofia_glue_transport_has_tls(gateway->register_transport) ? 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 { } else {
format = strchr(sipip, ':') ? "<sip:gw+%s@[%s]:%d%s>" : "<sip:gw+%s@%s:%d%s>"; 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, gateway->register_contact = switch_core_sprintf(gateway->pool, format, gateway->name,
sipip, sipip,
sofia_glue_transport_has_tls(gateway->register_transport) ? 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, profile->public_url = switch_core_sprintf(profile->pool,
"sip:%s@%s%s%s:%d", "sip:%s@%s%s%s:%d",
profile->contact_user, 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)) { if (profile->extsipip && !sofia_test_pflag(profile, PFLAG_AUTO_NAT)) {
char *ipv6 = strchr(profile->extsipip, ':'); char *ipv6 = strchr(profile->extsipip, ':');
profile->url = switch_core_sprintf(profile->pool, profile->url = switch_core_sprintf(profile->pool,
"sip:%s@%s%s%s:%d", "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); profile->bindurl = switch_core_sprintf(profile->pool, "%s;maddr=%s", profile->url, profile->sipip);
} else { } else {
char *ipv6 = strchr(profile->sipip, ':'); 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) { if (sip->sip_contact->m_url->url_port) {
port = atoi(sip->sip_contact->m_url->url_port); port = atoi(sip->sip_contact->m_url->url_port);
} else { } 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, ':'); ipv6 = strchr(host, ':');

2
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -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); ipv6 ? "[" : "", ip_addr, ipv6 ? "]" : "", tech_pvt->profile->tls_sip_port);
} else { } else {
tech_pvt->invite_contact = switch_core_session_sprintf(session, "sip:%s@%s%s%s:%d", contact, 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 { } else {
if (sofia_glue_transport_has_tls(tech_pvt->transport)) { if (sofia_glue_transport_has_tls(tech_pvt->transport)) {