kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash on transport=tls with non-TLS profile 

We use the transport of the Contact header of the remote UAC to decide
which of our own Contact addresses we should use when replying to a
SUBSCRIBE or sending a presence NOTIFY.

If TLS is not enabled on a Sofia profile, then the TLS Contacts for
that profile are NULL.  Unfortunately we were using these NULL values
uncritically when the remote UAC sent us a Contact header with a TLS
transport and our own Sofia profile did not have TLS enabled.

With this commit we fall back to our TCP Contact address when the
remote Contact is TLS and our Sofia profile does not have TLS enabled.
This commit is contained in:
Travis Cross 2014-10-10 18:25:11 +00:00
parent 66dafbde8c
commit b5294c53d6
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2667,7 +2667,8 @@ switch_status_t sofia_glue_send_notify(sofia_profile_t *profile, const char *use
contact_str = profile->tcp_public_contact;
break;
case SOFIA_TRANSPORT_TCP_TLS:
contact_str = profile->tls_public_contact;
contact_str = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_public_contact : profile->tcp_public_contact;
break;
default:
contact_str = profile->public_url;
@ -2690,7 +2691,8 @@ switch_status_t sofia_glue_send_notify(sofia_profile_t *profile, const char *use
contact_str = profile->tcp_contact;
break;
case SOFIA_TRANSPORT_TCP_TLS:
contact_str = profile->tls_contact;
contact_str = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_contact : profile->tcp_contact;
break;
default:
contact_str = profile->url;

18
src/mod/endpoints/mod_sofia/sofia_presence.c
View File

@ -2227,7 +2227,8 @@ static void _send_presence_notify(sofia_profile_t *profile,
contact_str = profile->tcp_public_contact;
break;
case SOFIA_TRANSPORT_TCP_TLS:
contact_str = profile->tls_public_contact;
contact_str = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_public_contact : profile->tcp_public_contact;
break;
default:
contact_str = profile->public_url;
@ -2241,7 +2242,8 @@ static void _send_presence_notify(sofia_profile_t *profile,
contact_str = profile->tcp_contact;
break;
case SOFIA_TRANSPORT_TCP_TLS:
contact_str = profile->tls_contact;
contact_str = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_contact : profile->tcp_contact;
break;
default:
contact_str = profile->url;
@ -2687,7 +2689,8 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
contact_str = profile->tcp_public_contact;
break;
case SOFIA_TRANSPORT_TCP_TLS:
contact_str = profile->tls_public_contact;
contact_str = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_public_contact : profile->tcp_public_contact;
break;
default:
contact_str = profile->public_url;
@ -2706,7 +2709,8 @@ static int sofia_presence_sub_callback(void *pArg, int argc, char **argv, char *
contact_str = profile->tcp_contact;
break;
case SOFIA_TRANSPORT_TCP_TLS:
contact_str = profile->tls_contact;
contact_str = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_contact : profile->tcp_contact;
break;
default:
contact_str = profile->url;
@ -4036,9 +4040,11 @@ void sofia_presence_handle_sip_i_subscribe(int status,
}
} else if (switch_stristr("port=tls", contact->m_url->url_params)) {
if (np.is_auto_nat) {
cs = profile->tls_public_contact;
cs = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_public_contact : profile->tcp_public_contact;
} else {
cs = profile->tls_contact;
cs = sofia_test_pflag(profile, PFLAG_TLS) ?
profile->tls_contact : profile->tcp_contact;
}
}