cu_cp,rrc: make setup ue id a variant

Author: FabianEckermann

lib/rrc/ue/procedures/rrc_setup_procedure.cpp

@@ -11,6 +11,7 @@
 #include "rrc_setup_procedure.h"
 #include "../rrc_asn1_helpers.h"
 #include "srsran/asn1/rrc_nr/dl_ccch_msg.h"
+#include <variant>
 
 using namespace srsran;
 using namespace srsran::srs_cu_cp;
@@ -110,10 +111,10 @@ void rrc_setup_procedure::send_initial_ue_msg(const asn1::rrc_nr::rrc_setup_comp
         asn1::rrc_nr::rrc_setup_complete_ies_s::ng_5_g_s_tmsi_value_c_::types_opts::options::ng_5_g_s_tmsi) {
       context.five_g_s_tmsi = asn1_to_five_g_s_tmsi(rrc_setup_complete.ng_5_g_s_tmsi_value.ng_5_g_s_tmsi());
     } else {
-      if (!context.five_g_s_tmsi_part1.has_value()) {
+      if (!std::holds_alternative<asn1::fixed_bitstring<39>>(context.setup_ue_id)) {
         logger.log_warning("5G-S-TMSI part 1 is missing");
       } else {
-        context.five_g_s_tmsi = asn1_to_five_g_s_tmsi(context.five_g_s_tmsi_part1.value(),
+        context.five_g_s_tmsi = asn1_to_five_g_s_tmsi(std::get<asn1::fixed_bitstring<39>>(context.setup_ue_id),
                                                       rrc_setup_complete.ng_5_g_s_tmsi_value.ng_5_g_s_tmsi_part2());
       }
     }

lib/rrc/ue/rrc_ue_context.h

@@ -33,18 +33,18 @@ class rrc_ue_context_t
                    const rrc_ue_cfg_t&                    cfg_,
                    std::optional<rrc_ue_transfer_context> rrc_context_);
 
-  const ue_index_t                                         ue_index; // UE index assigned by the DU processor
-  const rnti_t                                             c_rnti;   // current C-RNTI
-  const rrc_cell_context                                   cell;     // current cell
-  const rrc_ue_cfg_t                                       cfg;
-  rrc_state                                                state = rrc_state::idle;
-  std::optional<rrc_meas_cfg>                              meas_cfg;
-  std::optional<asn1::fixed_bitstring<39>>                 five_g_s_tmsi_part1;
-  std::optional<cu_cp_five_g_s_tmsi>                       five_g_s_tmsi;
-  uint64_t                                                 setup_ue_id;
-  asn1::rrc_nr::establishment_cause_opts                   connection_cause;
-  std::map<srb_id_t, ue_srb_context>                       srbs;
-  std::optional<asn1::rrc_nr::ue_nr_cap_s>                 capabilities;
+  const ue_index_t                   ue_index; // UE index assigned by the DU processor
+  const rnti_t                       c_rnti;   // current C-RNTI
+  const rrc_cell_context             cell;     // current cell
+  const rrc_ue_cfg_t                 cfg;
+  rrc_state                          state = rrc_state::idle;
+  std::optional<rrc_meas_cfg>        meas_cfg;
+  std::optional<cu_cp_five_g_s_tmsi> five_g_s_tmsi;
+  std::variant<uint64_t, asn1::fixed_bitstring<39>>
+                                           setup_ue_id; ///< this is either a random value or the 5G-S-TMSI-PART1
+  asn1::rrc_nr::establishment_cause_opts   connection_cause;
+  std::map<srb_id_t, ue_srb_context>       srbs;
+  std::optional<asn1::rrc_nr::ue_nr_cap_s> capabilities;
   std::optional<asn1::rrc_nr::ue_cap_rat_container_list_l> capabilities_list;
   std::optional<rrc_ue_transfer_context> transfer_context; // Context of old UE when created through mobility.
   bool                                   reestablishment_ongoing = false;

lib/rrc/ue/rrc_ue_message_handlers.cpp

@@ -76,8 +76,7 @@ void rrc_ue_impl::handle_rrc_setup_request(const asn1::rrc_nr::rrc_setup_request
   const rrc_setup_request_ies_s& request_ies = request_msg.rrc_setup_request;
   switch (request_ies.ue_id.type().value) {
     case init_ue_id_c::types_opts::ng_5_g_s_tmsi_part1: {
-      context.five_g_s_tmsi_part1 = request_ies.ue_id.ng_5_g_s_tmsi_part1();
-      context.setup_ue_id         = request_ies.ue_id.ng_5_g_s_tmsi_part1().to_number();
+      context.setup_ue_id = request_ies.ue_id.ng_5_g_s_tmsi_part1();
       break;
     }
     case asn1::rrc_nr::init_ue_id_c::types_opts::random_value: