gnb,rrc: starting to read srb configuration from config

srsgnb/hdr/stack/rrc/rrc_nr_config.h

@@ -65,6 +65,9 @@ struct rrc_nr_cfg_t {
   uint16_t           mnc;
   bool               is_standalone;
 
+  srb_5g_cfg_t srb1_cfg;
+  srb_5g_cfg_t srb2_cfg;
+
   std::map<uint32_t, rrc_nr_cfg_five_qi_t> five_qi_cfg;
 
   std::array<srsran::CIPHERING_ALGORITHM_ID_NR_ENUM, srsran::CIPHERING_ALGORITHM_ID_NR_N_ITEMS> nea_preference_list;

srsgnb/src/stack/rrc/cell_asn1_config.cc

@@ -947,6 +947,21 @@ void fill_srb(const rrc_nr_cfg_t& cfg, srsran::nr_srb srb_id, asn1::rrc_nr::rlc_
   out.served_radio_bearer_present      = true;
   out.served_radio_bearer.set_srb_id() = (uint8_t)srb_id;
 
+  if (srb_id == srsran::nr_srb::srb1) {
+    if (cfg.srb1_cfg.present) {
+      out.rlc_cfg_present = true;
+      out.rlc_cfg         = cfg.srb1_cfg.rlc_cfg;
+    } else {
+      out.rlc_cfg_present = false;
+    }
+  } else if (srb_id == srsran::nr_srb::srb2) {
+    if (cfg.srb2_cfg.present) {
+      out.rlc_cfg_present = true;
+      out.rlc_cfg         = cfg.srb2_cfg.rlc_cfg;
+    } else {
+      out.rlc_cfg_present = false;
+    }
+  } else {
     out.rlc_cfg_present           = true;
     auto& ul_am                   = out.rlc_cfg.set_am().ul_am_rlc;
     ul_am.sn_field_len_present    = true;
@@ -960,6 +975,7 @@ void fill_srb(const rrc_nr_cfg_t& cfg, srsran::nr_srb srb_id, asn1::rrc_nr::rlc_
     dl_am.sn_field_len.value      = asn1::rrc_nr::sn_field_len_am_opts::size12;
     dl_am.t_reassembly.value      = t_reassembly_opts::ms35;
     dl_am.t_status_prohibit.value = asn1::rrc_nr::t_status_prohibit_opts::ms0;
+  }
 
   // mac-LogicalChannelConfig -- Cond LCH-Setup
   out.mac_lc_ch_cfg_present                    = true;