From b1f9e9d57ad062096f966ea9eb3892cb536e901b Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 13 Feb 2024 12:16:37 +0100 Subject: [PATCH] Reestablishment: preserve additional secondaryUE data The previous code removed the "secondary UE" data (about DU association, DU UE ID, associated CU UP), and only filled the F1-related data. In other words, the associated CU-UP was lost. This commit reworks this piece of code to retrieve old data, and update the relevant data without destroying other. --- openair2/RRC/NR/rrc_gNB.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c index 70a28b738e..acc5233151 100644 --- a/openair2/RRC/NR/rrc_gNB.c +++ b/openair2/RRC/NR/rrc_gNB.c @@ -1203,8 +1203,9 @@ static void rrc_handle_RRCReestablishmentRequest(gNB_RRC_INST *rrc, sctp_assoc_t // update with new RNTI, and update secondary UE association UE->rnti = msg->crnti; + f1_ue_data_t ue_data = cu_get_f1_ue_data(UE->rrc_ue_id); + ue_data.secondary_ue = msg->gNB_DU_ue_id; cu_remove_f1_ue_data(UE->rrc_ue_id); - f1_ue_data_t ue_data = {.secondary_ue = msg->gNB_DU_ue_id, .du_assoc_id = assoc_id}; cu_add_f1_ue_data(UE->rrc_ue_id, &ue_data); LOG_I(NR_RRC, "Accept Reestablishment Request UE physCellId %ld cause %s\n", physCellId, scause);