From 4d0cead86626b85e52bc7868542625b5801a497b Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 22 Dec 2016 16:13:44 -0600 Subject: [PATCH] FS-4102: [mod_sofia] invite to gateway without registration goes to another wrong host #resolve Conflicts: libs/sofia-sip/.update --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index b3d2ea9e75..861f84640c 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Mon Oct 10 15:54:37 CDT 2016 +Fri Dec 30 15:29:04 CST 2016 diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c index 8efaa31d4c..43e36f3018 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c +++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_client.c @@ -880,6 +880,11 @@ int nua_client_request_sendmsg(nua_client_request_t *cr) if (ds->ds_ltarget && !cr->cr_has_contact) sip_add_dup(msg, sip, (sip_header_t *)ds->ds_ltarget); + /* + FS-4102 + It was decided to comment out this code because it does not appear to make sense + Dec 22, 2016 + if (nua_registration_add_contact_to_request(nh, msg, sip, cr->cr_contactize && !cr->cr_has_contact && @@ -888,6 +893,8 @@ int nua_client_request_sendmsg(nua_client_request_t *cr) msg_destroy(msg); return -1; } + */ + } cr->cr_wait_for_cred = 0;