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

fix contact issue 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16603 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2010-02-11 15:18:52 +00:00
parent 6d47019937
commit be9e84e5c5
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1901,7 +1901,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
if (status < 200) { if (status < 200) {
char *sticky = NULL; char *sticky = NULL;
char *contactstr = profile->url; char *contactstr = profile->url, *cs = NULL;
char *p = NULL, *new_contactstr = NULL; char *p = NULL, *new_contactstr = NULL;
if (is_nat) { if (is_nat) {
@ -1922,29 +1922,38 @@ void sofia_presence_handle_sip_i_subscribe(int status,
if (switch_stristr("port=tcp", contact->m_url->url_params)) { if (switch_stristr("port=tcp", contact->m_url->url_params)) {
if (is_auto_nat) { if (is_auto_nat) {
contactstr = profile->tcp_public_contact; cs = profile->tcp_public_contact;
} else { } else {
contactstr = profile->tcp_contact; cs = profile->tcp_contact;
} }
} else if (switch_stristr("port=tls", contact->m_url->url_params)) { } else if (switch_stristr("port=tls", contact->m_url->url_params)) {
if (is_auto_nat) { if (is_auto_nat) {
contactstr = profile->tls_contact; cs = profile->tls_public_contact;
} else { } else {
contactstr = profile->tls_public_contact; cs = profile->tls_contact;
} }
} }
if (cs) {
contactstr = cs;
}
if (nh && nh->nh_ds && nh->nh_ds->ds_usage) { if (nh && nh->nh_ds && nh->nh_ds->ds_usage) {
/* nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); */ /* nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta + SUB_OVERLAP, exp_delta + SUB_OVERLAP); */
nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta * 2, exp_delta * 2); nua_dialog_usage_set_refresh_range(nh->nh_ds->ds_usage, exp_delta * 2, exp_delta * 2);
} }
if ((p = strchr(contactstr, '@'))) { if (contactstr && (p = strchr(contactstr, '@'))) {
new_contactstr = switch_mprintf("sip:%s%s", to_user, p); if (strrchr(p, '>')) {
new_contactstr = switch_mprintf("<sip:%s%s", to_user, p);
} else {
new_contactstr = switch_mprintf("<sip:%s%s>", to_user, p);
}
} }
nua_respond(nh, SIP_202_ACCEPTED, nua_respond(nh, SIP_202_ACCEPTED,
SIPTAG_CONTACT_STR(new_contactstr), TAG_IF(new_contactstr, SIPTAG_CONTACT_STR(new_contactstr)),
NUTAG_WITH_THIS(nua), NUTAG_WITH_THIS(nua),
SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EXPIRES_STR(exp_delta_str), TAG_IF(sticky, NUTAG_PROXY(sticky)), TAG_END()); SIPTAG_SUBSCRIPTION_STATE_STR(sstr), SIPTAG_EXPIRES_STR(exp_delta_str), TAG_IF(sticky, NUTAG_PROXY(sticky)), TAG_END());