kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-07 08:21:08 +00:00
Code Issues Projects Releases Wiki Activity

deal with some sips: contacts

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8861 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-06-27 21:38:59 +00:00
parent 0ca1319e1a
commit 978486d139
1 changed files with 53 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/mod/endpoints/mod_sofia/sofia_reg.c
View File

@ -439,6 +439,11 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
const char *contact_host = contact->m_url->url_host; const char *contact_host = contact->m_url->url_host;
char *path_encoded = NULL; char *path_encoded = NULL;
int path_encoded_len = 0; int path_encoded_len = 0;
const char *proto = "sip";
if (sip->sip_contact->m_url->url_type == url_sips) {
proto = "sips";
}
display = contact->m_display; display = contact->m_display;
@ -475,11 +480,11 @@ uint8_t sofia_reg_handle_register(nua_t *nua, sofia_profile_t *profile, nua_hand
} }
if (contact->m_url->url_params) { if (contact->m_url->url_params) {
switch_snprintf(contact_str, sizeof(contact_str), "%s <sip:%s@%s%s;%s%s%s%s>", switch_snprintf(contact_str, sizeof(contact_str), "%s <%s:%s@%s%s;%s%s%s%s>",
display, contact->m_url->url_user, contact_host, new_port, display, proto, contact->m_url->url_user, contact_host, new_port,
contact->m_url->url_params, received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : ""); contact->m_url->url_params, received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : "");
} else { } else {
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, switch_snprintf(contact_str, sizeof(contact_str), "%s <%s:%s@%s%s%s%s%s>", display, proto, contact->m_url->url_user, contact_host, new_port,
received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : ""); received_data, is_nat ? ";fs_nat=yes" : "", path_encoded ? path_encoded : "");
} }
@ -730,6 +735,7 @@ void sofia_reg_handle_sip_i_register(nua_t *nua, sofia_profile_t *profile, nua_h
sofia_regtype_t type = REG_REGISTER; sofia_regtype_t type = REG_REGISTER;
int network_port = 0; int network_port = 0;
char *is_nat = NULL; char *is_nat = NULL;
int is_tls = 0, is_tcp = 0;
get_addr(network_ip, sizeof(network_ip), &((struct sockaddr_in *) my_addrinfo->ai_addr)->sin_addr); 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); network_port = ntohs(((struct sockaddr_in *) msg_addrinfo(nua_current_request(nua))->ai_addr)->sin_port);
@ -746,41 +752,55 @@ void sofia_reg_handle_sip_i_register(nua_t *nua, sofia_profile_t *profile, nua_h
goto end; goto end;
} }
if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) { if (switch_stristr("transport=tls", sip->sip_contact->m_url->url_params)) {
if (sip && sip->sip_via) { is_tls += 1;
const char *port = sip->sip_via->v_port;
const char *host = sip->sip_via->v_host;
if (host && sip->sip_via->v_received) {
is_nat = "via received";
} else 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) { if (sip->sip_contact->m_url->url_type == url_sips) {
uint32_t x = 0; is_tls += 2;
int ok = 1; }
char *last_acl = NULL;
const char *contact_host = NULL;
if (sip && sip->sip_contact && sip->sip_contact->m_url) { if (switch_stristr("transport=tcp", sip->sip_contact->m_url->url_params)) {
contact_host = sip->sip_contact->m_url->url_host; is_tcp = 1;
} }
if (!switch_strlen_zero(contact_host)) { if (!is_tls && !is_tcp) {
for (x = 0; x < profile->nat_acl_count; x++) { if ((profile->pflags & PFLAG_AGGRESSIVE_NAT_DETECTION)) {
last_acl = profile->nat_acl[x]; if (sip && sip->sip_via) {
if (!(ok = switch_check_network_list_ip(contact_host, last_acl))) { const char *port = sip->sip_via->v_port;
break; const char *host = sip->sip_via->v_host;
if (host && sip->sip_via->v_received) {
is_nat = "via received";
} else if (host && strcmp(network_ip, host)) {
is_nat = "via host";
} else if (port && atoi(port) != network_port) {
is_nat = "via port";
} }
} }
}
if (ok) { if (!is_nat && profile->nat_acl_count) {
is_nat = last_acl; 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) {
is_nat = last_acl;
}
} }
} }
} }