rrc: log error rather than throwing fatal error if invalid measurement report is received

Author: herlesupreeth

lib/rrc/ue/rrc_measurement_types_asn1_converters.h

@@ -1258,7 +1258,8 @@ inline rrc_meas_result_nr asn1_to_meas_result_nr(const asn1::rrc_nr::meas_result
   return meas_result_nr;
 };
 
-inline rrc_meas_results asn1_to_measurement_results(const asn1::rrc_nr::meas_results_s& asn1_meas_results)
+inline rrc_meas_results asn1_to_measurement_results(const asn1::rrc_nr::meas_results_s& asn1_meas_results,
+                                                    srslog::basic_logger&               logger)
 {
   rrc_meas_results meas_results;
 
@@ -1295,8 +1296,8 @@ inline rrc_meas_results asn1_to_measurement_results(const asn1::rrc_nr::meas_res
       }
     } else {
       // error
-      report_fatal_error("Invalid meas result neigh cells type = {}.",
-                         asn1_meas_results.meas_result_neigh_cells.type());
+      logger.error("Ignoring neighbor cell measurement. Cause: Unsupported cell type {}",
+                   asn1_meas_results.meas_result_neigh_cells.type().to_string());
     }
 
     meas_results.meas_result_neigh_cells = meas_result_neigh_cell;

lib/rrc/ue/rrc_ue_message_handlers.cpp

@@ -222,9 +222,13 @@ void rrc_ue_impl::handle_ul_info_transfer(const ul_info_transfer_ies_s& ul_info_
 void rrc_ue_impl::handle_measurement_report(const asn1::rrc_nr::meas_report_s& msg)
 {
   // convert asn1 to common type
-  rrc_meas_results meas_results = asn1_to_measurement_results(msg.crit_exts.meas_report().meas_results);
-  // send measurement results to cell measurement manager
-  measurement_notifier.on_measurement_report(meas_results);
+  rrc_meas_results meas_results =
+      asn1_to_measurement_results(msg.crit_exts.meas_report().meas_results, srslog::fetch_basic_logger("RRC"));
+  // Send measurement results to cell measurement manager only measurements are not empty.
+  if (meas_results.meas_result_neigh_cells.has_value() and
+      not meas_results.meas_result_neigh_cells->meas_result_list_nr.empty()) {
+    measurement_notifier.on_measurement_report(meas_results);
+  }
 }
 
 void rrc_ue_impl::handle_dl_nas_transport_message(byte_buffer nas_pdu)

tests/unittests/rrc/rrc_ue_meas_report_test.cpp

@@ -32,7 +32,6 @@ class rrc_ue_meas_report : public rrc_ue_test_helper, public ::testing::Test
   }
 };
 
-/// Test the RRC Reestablishment
 TEST_F(rrc_ue_meas_report, when_dummy_meas_report_received_then_conversion_successful)
 {
   byte_buffer meas_report_pdu = generate_measurement_report_pdu();
@@ -45,7 +44,7 @@ TEST_F(rrc_ue_meas_report, when_dummy_meas_report_received_then_conversion_succe
   ASSERT_EQ(ul_dcch_msg.msg.c1().type().value, asn1::rrc_nr::ul_dcch_msg_type_c::c1_c_::types_opts::meas_report);
 
   rrc_meas_results meas_results =
-      asn1_to_measurement_results(ul_dcch_msg.msg.c1().meas_report().crit_exts.meas_report().meas_results);
+      asn1_to_measurement_results(ul_dcch_msg.msg.c1().meas_report().crit_exts.meas_report().meas_results, logger);
 
   // check if the meas results conversion was successful
   check_meas_results(meas_results);