cu_cp,rrc: Request ue release when reconfiguration fails

Author: FabianEckermann

lib/rrc/ue/procedures/rrc_reconfiguration_procedure.cpp

@@ -11,6 +11,7 @@
 #include "rrc_reconfiguration_procedure.h"
 #include "../rrc_asn1_helpers.h"
 #include "srsran/cu_cp/du_processor.h"
+#include "srsran/ran/cause.h"
 
 using namespace srsran;
 using namespace srsran::srs_cu_cp;
@@ -19,12 +20,14 @@ using namespace asn1::rrc_nr;
 rrc_reconfiguration_procedure::rrc_reconfiguration_procedure(rrc_ue_context_t&                            context_,
                                                              const rrc_reconfiguration_procedure_request& args_,
                                                              rrc_ue_reconfiguration_proc_notifier& rrc_ue_notifier_,
+                                                             rrc_ue_control_notifier&              ngap_ctrl_notifier_,
                                                              rrc_ue_event_manager&                 event_mng_,
                                                              rrc_ue_srb_handler&                   srb_notifier_,
                                                              rrc_ue_logger&                        logger_) :
   context(context_),
   args(args_),
   rrc_ue(rrc_ue_notifier_),
+  ngap_ctrl_notifier(ngap_ctrl_notifier_),
   event_mng(event_mng_),
   srb_notifier(srb_notifier_),
   logger(logger_)
@@ -62,6 +65,7 @@ void rrc_reconfiguration_procedure::operator()(coro_context<async_task<bool>>& c
     procedure_result = true;
   } else {
     logger.log_warning("\"{}\" timed out after {}ms", name(), context.cfg.rrc_procedure_timeout_ms);
+    send_ue_context_release_request();
   }
 
   logger.log_debug("\"{}\" finalized", name());
@@ -76,3 +80,10 @@ void rrc_reconfiguration_procedure::send_rrc_reconfiguration()
   fill_asn1_rrc_reconfiguration_msg(rrc_reconfig, transaction.id(), args);
   rrc_ue.on_new_dl_dcch(srb_id_t::srb1, dl_dcch_msg);
 }
+
+void rrc_reconfiguration_procedure::send_ue_context_release_request()
+{
+  cu_cp_ue_context_release_request ue_context_release_request{
+      context.ue_index, {}, cause_radio_network_t::release_due_to_ngran_generated_reason};
+  ngap_ctrl_notifier.on_ue_context_release_request(ue_context_release_request);
+}

lib/rrc/ue/procedures/rrc_reconfiguration_procedure.h

@@ -31,6 +31,7 @@ class rrc_reconfiguration_procedure
   rrc_reconfiguration_procedure(rrc_ue_context_t&                            context_,
                                 const rrc_reconfiguration_procedure_request& args_,
                                 rrc_ue_reconfiguration_proc_notifier&        rrc_ue_notifier_,
+                                rrc_ue_control_notifier&                     ngap_ctrl_notifier_,
                                 rrc_ue_event_manager&                        ev_mng_,
                                 rrc_ue_srb_handler&                          srb_notifier_,
                                 rrc_ue_logger&                               logger_);
@@ -43,10 +44,13 @@ class rrc_reconfiguration_procedure
   /// \remark Send RRC Reconfiguration, see section 5.3.5 in TS 38.331
   void send_rrc_reconfiguration();
 
+  void send_ue_context_release_request();
+
   rrc_ue_context_t&                           context;
   const rrc_reconfiguration_procedure_request args;
 
-  rrc_ue_reconfiguration_proc_notifier& rrc_ue;       // handler to the parent RRC UE object
+  rrc_ue_reconfiguration_proc_notifier& rrc_ue; // handler to the parent RRC UE object
+  rrc_ue_control_notifier&              ngap_ctrl_notifier;
   rrc_ue_event_manager&                 event_mng;    // event manager for the RRC UE entity
   rrc_ue_srb_handler&                   srb_notifier; // For creating SRBs
   rrc_ue_logger&                        logger;

lib/rrc/ue/rrc_ue_message_handlers.cpp

@@ -239,7 +239,8 @@ void rrc_ue_impl::handle_rrc_transaction_complete(const ul_dcch_msg_s& msg, uint
 
 async_task<bool> rrc_ue_impl::handle_rrc_reconfiguration_request(const rrc_reconfiguration_procedure_request& msg)
 {
-  return launch_async<rrc_reconfiguration_procedure>(context, msg, *this, *event_mng, get_rrc_ue_srb_handler(), logger);
+  return launch_async<rrc_reconfiguration_procedure>(
+      context, msg, *this, ngap_ctrl_notifier, *event_mng, get_rrc_ue_srb_handler(), logger);
 }
 
 uint8_t rrc_ue_impl::handle_handover_reconfiguration_request(const rrc_reconfiguration_procedure_request& msg)