After the CBRA, the UE sends the RRCReconfigurationComplete to the target gNB-DU

openair2/RRC/NR/rrc_gNB.c

@@ -2226,6 +2226,15 @@ static void rrc_CU_process_ue_context_modification_response(MessageDef *msg_p, i
 
     rrc_gNB_generate_dedicatedRRCReconfiguration(&ctxt, ue_context_p);
   }
+
+  // Update with new RNTI, and update secondary UE association
+  if (UE->StatusRrc == NR_RRC_HO_EXECUTION) {
+    f1_ue_data_t ue_data = cu_get_f1_ue_data(UE->rrc_ue_id);
+    ue_data.secondary_ue = UE->handover_info.target_rnti;
+    ue_data.du_assoc_id = UE->handover_info.target_assoc_id;
+    cu_remove_f1_ue_data(UE->rrc_ue_id);
+    cu_add_f1_ue_data(UE->rrc_ue_id, &ue_data);
+  }
 }
 
 static void rrc_CU_process_ue_modification_required(MessageDef *msg_p)

openair2/RRC/NR_UE/rrc_UE.c

@@ -843,6 +843,15 @@ void nr_rrc_cellgroup_configuration(NR_UE_RRC_INST_t *rrc, NR_CellGroupConfig_t
         if (get_DRB_status(rrc, i) == RB_SUSPENDED)
           set_DRB_status(rrc, i, RB_ESTABLISHED);
       }
+      if (cellGroupConfig->rlc_BearerToAddModList != NULL) {
+        for (int i = 0; i < cellGroupConfig->rlc_BearerToAddModList->list.count; i++) {
+          NR_RLC_BearerConfig_t *rlc_bearer = cellGroupConfig->rlc_BearerToAddModList->list.array[i];
+          NR_LogicalChannelIdentity_t lcid = rlc_bearer->logicalChannelIdentity;
+          if (rrc->active_RLC_entity[lcid]) {
+            nr_rlc_reestablish_entity(rrc->ue_id, lcid);
+          }
+        }
+      }
       // TODO reset MAC
     }
     nr_rrc_handle_SetupRelease_RLF_TimersAndConstants(rrc, spCellConfig->rlf_TimersAndConstants);