From a1905072b84f42fe7552686b733323b0f61f9fca Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Tue, 29 Mar 2022 12:41:55 +0200 Subject: [PATCH] srsue,rrc_nr: check SDAP configuration before passing to SDAP module --- srsue/src/stack/rrc_nr/rrc_nr.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/srsue/src/stack/rrc_nr/rrc_nr.cc b/srsue/src/stack/rrc_nr/rrc_nr.cc index 3119532c7..093e0181d 100644 --- a/srsue/src/stack/rrc_nr/rrc_nr.cc +++ b/srsue/src/stack/rrc_nr/rrc_nr.cc @@ -1927,6 +1927,14 @@ bool rrc_nr::apply_drb_add_mod(const drb_to_add_mod_s& drb_cfg) } else if (drb_cfg.cn_assoc.type() == drb_to_add_mod_s::cn_assoc_c_::types_opts::sdap_cfg) { const auto& sdap_cfg = drb_cfg.cn_assoc.sdap_cfg(); + // Check supported configuration + if (sdap_cfg.sdap_hdr_dl.value == sdap_cfg_s::sdap_hdr_dl_opts::present || !sdap_cfg.default_drb || + sdap_cfg.mapped_qos_flows_to_add.size() != 1) { + logger.error( + "Configuring SDAP: only UL headder is supported. Default DRB must be set and number of QoS flows must be 1"); + return false; + } + sdap_interface_rrc::bearer_cfg_t sdap_bearer_cfg = {}; sdap_bearer_cfg.add_downlink_header = sdap_cfg.sdap_hdr_dl.value == sdap_cfg_s::sdap_hdr_dl_opts::present; sdap_bearer_cfg.add_uplink_header = sdap_cfg.sdap_hdr_ul.value == sdap_cfg_s::sdap_hdr_ul_opts::present;