cu_cp,ngap: add constructors to cu_cp_five_g_s_tmsi

Author: FabianEckermann

include/srsran/cu_cp/cu_cp_types.h

@@ -132,6 +132,20 @@ struct cu_cp_amf_identifier_t {
 };
 
 struct cu_cp_five_g_s_tmsi {
+  cu_cp_five_g_s_tmsi() = default;
+
+  cu_cp_five_g_s_tmsi(const bounded_bitset<48>& five_g_s_tmsi_) : five_g_s_tmsi(five_g_s_tmsi_)
+  {
+    srsran_assert(five_g_s_tmsi_.size() == 48, "Invalid size for 5G-S-TMSI ({})", five_g_s_tmsi_.size());
+  }
+
+  cu_cp_five_g_s_tmsi(uint64_t amf_set_id, uint64_t amf_pointer, uint64_t five_g_tmsi)
+  {
+    five_g_s_tmsi.emplace();
+    five_g_s_tmsi->resize(48);
+    five_g_s_tmsi->from_uint64((amf_set_id << 38U) + (amf_pointer << 32U) + five_g_tmsi);
+  }
+
   uint16_t get_amf_set_id() const
   {
     srsran_assert(five_g_s_tmsi.has_value(), "five_g_s_tmsi is not set");
@@ -152,6 +166,7 @@ struct cu_cp_five_g_s_tmsi {
 
   uint64_t to_number() const { return five_g_s_tmsi->to_uint64(); }
 
+private:
   std::optional<bounded_bitset<48>> five_g_s_tmsi;
 };
 

lib/ngap/ngap_asn1_converters.h

@@ -844,13 +844,9 @@ inline cu_cp_five_g_s_tmsi ngap_asn1_to_ue_paging_id(const asn1::ngap::ue_paging
   srsran_assert(asn1_ue_id.type() == asn1::ngap::ue_paging_id_c::types_opts::five_g_s_tmsi,
                 "Invalid UE paging ID type");
 
-  bounded_bitset<48> five_g_s_tmsi(48);
-
-  five_g_s_tmsi.from_uint64(((uint64_t)asn1_ue_id.five_g_s_tmsi().amf_set_id.to_number() << 38U) +
-                            ((uint64_t)asn1_ue_id.five_g_s_tmsi().amf_pointer.to_number() << 32U) +
-                            asn1_ue_id.five_g_s_tmsi().five_g_tmsi.to_number());
-
-  return cu_cp_five_g_s_tmsi{five_g_s_tmsi};
+  return cu_cp_five_g_s_tmsi{asn1_ue_id.five_g_s_tmsi().amf_set_id.to_number(),
+                             asn1_ue_id.five_g_s_tmsi().amf_pointer.to_number(),
+                             asn1_ue_id.five_g_s_tmsi().five_g_tmsi.to_number()};
 }
 
 } // namespace srs_cu_cp