From fc2b6a7fb52f1c6ff35e9a30cc604ae6dc40c800 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Thu, 5 Aug 2021 13:04:08 +0200 Subject: [PATCH] ue,rrc: fail NR reconfiguration if mac-logicalChannelConfig is not present --- srsue/src/stack/rrc/rrc_nr.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/srsue/src/stack/rrc/rrc_nr.cc b/srsue/src/stack/rrc/rrc_nr.cc index 5c5753ffd..a5caada5c 100644 --- a/srsue/src/stack/rrc/rrc_nr.cc +++ b/srsue/src/stack/rrc/rrc_nr.cc @@ -456,17 +456,17 @@ bool rrc_nr::apply_rlc_add_mod(const rlc_bearer_cfg_s& rlc_bearer_cfg) add_lcid_drb(lc_ch_id, drb_id); } } else { - logger.warning("In RLC bearer cfg does not contain served radio bearer"); + logger.error("In RLC bearer cfg does not contain served radio bearer"); return false; } if (rlc_bearer_cfg.rlc_cfg_present == true) { if (srsran::make_rlc_config_t(rlc_bearer_cfg.rlc_cfg, &rlc_cfg) != SRSRAN_SUCCESS) { - logger.warning("Failed to build RLC config"); + logger.error("Failed to build RLC config"); return false; } } else { - logger.warning("In RLC bearer cfg does not contain rlc cfg"); + logger.error("In RLC bearer cfg does not contain rlc cfg"); return false; } @@ -477,6 +477,9 @@ bool rrc_nr::apply_rlc_add_mod(const rlc_bearer_cfg_s& rlc_bearer_cfg) logical_channel_config_t logical_channel_cfg; logical_channel_cfg = srsran::make_mac_logical_channel_cfg_t(lc_ch_id, rlc_bearer_cfg.mac_lc_ch_cfg); mac->setup_lcid(logical_channel_cfg); + } else { + logger.error("Bearer config for LCID %d does not contain mac-LogicalChannelConfig.", lc_ch_id); + return false; } return true; }