cu_cp,rrc: store timers in rrc

Author: FabianEckermann

include/srsran/rrc/rrc_cell_context.h

@@ -21,13 +21,29 @@ namespace srsran {
 
 namespace srs_cu_cp {
 
+/// \brief RRC timers, see TS 38.331 section 7.1.1.
+struct rrc_timers_t {
+  /// T300: RRC Connection Establishment timer in ms. The timer starts upon transmission of RRCSetupRequest.
+  std::chrono::milliseconds t300;
+  /// T301: RRC Connection Re-establishment timer in ms. The timer starts upon transmission of
+  /// RRCReestablishmentRequest.
+  std::chrono::milliseconds t301;
+  /// T310: Out-of-sync timer in ms. The timer starts upon detecting physical layer problems for the SpCell i.e. upon
+  /// receiving N310 consecutive out-of-sync indications from lower layers.
+  std::chrono::milliseconds t310;
+  /// T311: RRC Connection Re-establishment procedure timer in ms. The timer starts upon initiating the RRC connection
+  /// re-establishment procedure.
+  std::chrono::milliseconds t311;
+};
+
 // Cell-related configuration used by the RRC.
 struct rrc_cell_context {
   nr_cell_global_id_t  cgi;
   tac_t                tac;
   pci_t                pci;
   unsigned             ssb_arfcn; ///< Absolute SSB position.
   std::vector<nr_band> bands;     ///< Required for capability band filter.
+  rrc_timers_t         timers;
 };
 
 } // namespace srs_cu_cp

include/srsran/rrc/rrc_du.h

@@ -15,13 +15,15 @@
 #include "srsran/rrc/rrc_cell_context.h"
 #include "srsran/rrc/rrc_metrics.h"
 #include "srsran/rrc/rrc_ue.h"
+#include <chrono>
 
 namespace srsran {
 namespace srs_cu_cp {
 
 struct rrc_cell_info {
   nr_band                      band;
   std::vector<rrc_meas_timing> meas_timings;
+  rrc_timers_t                 timers;
 };
 
 class rrc_du_cell_manager

lib/rrc/rrc_du_impl.cpp

@@ -30,6 +30,11 @@ rrc_du_impl::rrc_du_impl(const rrc_cfg_t& cfg_, rrc_du_measurement_config_notifi
 bool rrc_du_impl::handle_served_cell_list(const std::vector<cu_cp_du_served_cells_item>& served_cell_list)
 {
   for (const auto& served_cell : served_cell_list) {
+    if (!served_cell.gnb_du_sys_info.has_value()) {
+      logger.error("Missing gnb_du_sys_info for served cell");
+      return false;
+    }
+
     rrc_cell_info cell_info;
 
     // TODO: which freq band to use here?
@@ -46,21 +51,32 @@ bool rrc_du_impl::handle_served_cell_list(const std::vector<cu_cp_du_served_cell
     asn1::cbit_ref                  bref_meas{served_cell.served_cell_info.meas_timing_cfg};
     asn1::rrc_nr::meas_timing_cfg_s asn1_meas_timing_cfg;
     if (asn1_meas_timing_cfg.unpack(bref_meas) != asn1::SRSASN_SUCCESS) {
-      logger.error("Failed to unpack Measurement Timing Config container.");
+      logger.error("Failed to unpack Measurement Timing Config container");
       return false;
     }
     if (asn1_meas_timing_cfg.crit_exts.type() != meas_timing_cfg_s::crit_exts_c_::types_opts::c1 ||
         asn1_meas_timing_cfg.crit_exts.c1().type() !=
             meas_timing_cfg_s::crit_exts_c_::c1_c_::types_opts::meas_timing_conf ||
         asn1_meas_timing_cfg.crit_exts.c1().meas_timing_conf().meas_timing.size() == 0) {
-      logger.error("Invalid Measurement Timing Config container.");
+      logger.error("Invalid Measurement Timing Config container");
       return false;
     }
 
     for (const auto& asn1_meas_timing : asn1_meas_timing_cfg.crit_exts.c1().meas_timing_conf().meas_timing) {
       cell_info.meas_timings.push_back(asn1_to_meas_timing(asn1_meas_timing));
     }
 
+    // Unpack SIB1 to store timers.
+    asn1::rrc_nr::sib1_s sib1_msg;
+    asn1::cbit_ref       bref2(served_cell.gnb_du_sys_info.value().sib1_msg);
+    if (sib1_msg.unpack(bref2) != asn1::SRSASN_SUCCESS) {
+      report_fatal_error("Failed to unpack SIB1");
+    }
+    cell_info.timers.t300 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t300.to_number()};
+    cell_info.timers.t301 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t301.to_number()};
+    cell_info.timers.t310 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t310.to_number()};
+    cell_info.timers.t311 = std::chrono::milliseconds{sib1_msg.ue_timers_and_consts.t311.to_number()};
+
     cell_info_db.emplace(served_cell.served_cell_info.nr_cgi.nci, cell_info);
 
     // Fill cell meas config.