cu_cp,rrc: schedule ue release if rrc reconfiguration fails

Author: FabianEckermann

lib/rrc/ue/procedures/rrc_reconfiguration_procedure.cpp

@@ -20,13 +20,15 @@ rrc_reconfiguration_procedure::rrc_reconfiguration_procedure(rrc_ue_context_t&
                                                              const rrc_reconfiguration_procedure_request& args_,
                                                              rrc_ue_reconfiguration_proc_notifier& rrc_ue_notifier_,
                                                              rrc_ue_context_update_notifier&       cu_cp_notifier_,
+                                                             rrc_ue_cu_cp_ue_notifier&             cu_cp_ue_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_),
   cu_cp_notifier(cu_cp_notifier_),
+  cu_cp_ue_notifier(cu_cp_ue_notifier_),
   event_mng(event_mng_),
   srb_notifier(srb_notifier_),
   logger(logger_)
@@ -65,11 +67,10 @@ void rrc_reconfiguration_procedure::operator()(coro_context<async_task<bool>>& c
   } else {
     logger.log_warning("\"{}\" timed out after {}ms", name(), context.cfg.rrc_procedure_timeout_ms);
     // Notify NGAP to request UE context release from AMF
-    CORO_AWAIT(cu_cp_notifier.on_ue_release_required(
+    cu_cp_ue_notifier.schedule_async_task(cu_cp_notifier.on_ue_release_required(
         {context.ue_index, {}, ngap_cause_radio_network_t::release_due_to_ngran_generated_reason}));
   }
 
-  logger.log_debug("\"{}\" finalized", name());
   CORO_RETURN(procedure_result);
 }
 

lib/rrc/ue/procedures/rrc_reconfiguration_procedure.h

@@ -29,7 +29,8 @@ class rrc_reconfiguration_procedure
                                 const rrc_reconfiguration_procedure_request& args_,
                                 rrc_ue_reconfiguration_proc_notifier&        rrc_ue_notifier_,
                                 rrc_ue_context_update_notifier&              cu_cp_notifier_,
-                                rrc_ue_event_manager&                        ev_mng_,
+                                rrc_ue_cu_cp_ue_notifier&                    cu_cp_ue_notifier_,
+                                rrc_ue_event_manager&                        event_mng_,
                                 rrc_ue_srb_handler&                          srb_notifier_,
                                 rrc_ue_logger&                               logger_);
 
@@ -44,10 +45,11 @@ class rrc_reconfiguration_procedure
   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_context_update_notifier&       cu_cp_notifier; // to release the UE if the reconfiguration fails
-  rrc_ue_event_manager&                 event_mng;      // event manager for the RRC UE entity
-  rrc_ue_srb_handler&                   srb_notifier;   // For creating SRBs
+  rrc_ue_reconfiguration_proc_notifier& rrc_ue;            // handler to the parent RRC UE object
+  rrc_ue_context_update_notifier&       cu_cp_notifier;    // to release the UE if the reconfiguration fails
+  rrc_ue_cu_cp_ue_notifier&             cu_cp_ue_notifier; // to schedule the UE release
+  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;
 
   rrc_transaction               transaction;

lib/rrc/ue/rrc_ue_message_handlers.cpp

@@ -377,7 +377,7 @@ byte_buffer rrc_ue_impl::get_packed_ue_radio_access_cap_info() const
 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, cu_cp_notifier, *event_mng, get_rrc_ue_srb_handler(), logger);
+      context, msg, *this, cu_cp_notifier, cu_cp_ue_notifier, *event_mng, get_rrc_ue_srb_handler(), logger);
 }
 
 rrc_ue_handover_reconfiguration_context