Commit 48a1f1a7 authored by Robert Schmidt's avatar Robert Schmidt

Set CU UE ID in RLC on DL RRC transfer

parent 52f7e824
......@@ -287,6 +287,7 @@ void dl_rrc_message_transfer(const f1ap_dl_rrc_message_t *dl_rrc)
if (UE->cu_ue_id == (uint32_t)-1) {
UE->cu_ue_id = dl_rrc->gNB_CU_ue_id;
LOG_I(MAC, "Storing CU UE ID %d for UE with RNTI %04x\n", UE->cu_ue_id, UE->rnti);
nr_rlc_set_cu_ue_id(dl_rrc->gNB_DU_ue_id, dl_rrc->gNB_CU_ue_id);
}
AssertFatal(dl_rrc->old_gNB_DU_ue_id == NULL, "changing RNTI not implemented yet\n");
pthread_mutex_unlock(&mac->sched_lock);
......
......@@ -431,7 +431,7 @@ rb_found:
ctx.module_id = 0;
/* CU (PDCP, RRC, SDAP) use a different ID than RNTI, so below set the CU UE
* ID if in gNB, else use RNTI normally */
ctx.rntiMaybeUEid = is_enb ? ue->cu_ue_id : ue->rnti;
ctx.rntiMaybeUEid = is_enb ? ue->secondaryUEid : ue->rnti;
ctx.enb_flag = is_enb;
......@@ -456,7 +456,7 @@ rb_found:
msg = itti_alloc_new_message(TASK_RLC_ENB, 0, F1AP_UL_RRC_MESSAGE);
uint8_t *message_buffer = itti_malloc (TASK_RLC_ENB, TASK_DU_F1, size);
memcpy (message_buffer, buf, size);
F1AP_UL_RRC_MESSAGE(msg).gNB_CU_ue_id = ue->cu_ue_id;
F1AP_UL_RRC_MESSAGE(msg).gNB_CU_ue_id = ue->secondaryUEid;
F1AP_UL_RRC_MESSAGE(msg).gNB_DU_ue_id = ue->rnti;
F1AP_UL_RRC_MESSAGE(msg).srb_id = rb_id;
F1AP_UL_RRC_MESSAGE(msg).rrc_container = message_buffer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment