From dba3ee7b21b34a98af91949fca87dd2f1266d080 Mon Sep 17 00:00:00 2001
From: Grzegorz Sluja <grzegorz.sluja@iopsys.eu>
Date: Wed, 6 Oct 2021 15:31:29 +0200
Subject: [PATCH] fixup! Fix the user in FROM header for R4 call transfer

---
 res/res_pjsip_session.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index 4c9b7819f2..a9aaa1626f 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -1674,9 +1674,11 @@ static void set_from_header(struct ast_sip_session *session)
 	dlg_contact_uri = (pjsip_sip_uri*)pjsip_uri_get_uri(dlg_contact->uri);
 
 	if (session->endpoint->id.trust_outbound || !restricted) {
-		ast_sip_modify_id_header(dlg_pool, dlg_info, &session->id);
+		ast_sip_modify_id_header(dlg_pool, dlg_info, &connected_id);
 		if (ast_sip_get_use_callerid_contact() && ast_strlen_zero(session->endpoint->contact_user)) {
-			pj_strdup2(dlg_pool, &dlg_contact_uri->user, session->id.number.str);
+			pj_strdup2(dlg_pool, &dlg_contact_uri->user, S_COR(connected_id.number.valid, connected_id.number.str, ""));
+		} else {
+			pj_strdup2(dlg_pool, &dlg_info_uri->user, session->endpoint->contact_user);
 		}
 	}
 
-- 
GitLab