cu_cp,ngap: add optional nas pdu to pdu session resource setup request

Author: FabianEckermann

lib/cu_cp/routines/initial_context_setup_routine.cpp

@@ -116,24 +116,17 @@ void initial_context_setup_routine::operator()(
       request.pdu_session_res_setup_list_cxt_req.value().ue_aggregate_maximum_bit_rate_dl = 0;
     }
 
+    // Handle NAS PDUs from Initial Context Setup Request
+    if (request.nas_pdu.has_value()) {
+      request.pdu_session_res_setup_list_cxt_req.value().nas_pdu = request.nas_pdu.value().copy();
+    }
+
     CORO_AWAIT_VALUE(pdu_session_setup_response,
                      pdu_session_setup_handler.handle_new_pdu_session_resource_setup_request(
                          request.pdu_session_res_setup_list_cxt_req.value()));
 
     resp_msg.pdu_session_res_setup_response_items  = pdu_session_setup_response.pdu_session_res_setup_response_items;
     resp_msg.pdu_session_res_failed_to_setup_items = pdu_session_setup_response.pdu_session_res_failed_to_setup_items;
-
-    // Handle NAS PDUs from PDU Session Resource Setup List Context Request
-    for (auto& session : request.pdu_session_res_setup_list_cxt_req.value().pdu_session_res_setup_items) {
-      if (!session.pdu_session_nas_pdu.empty()) {
-        handle_nas_pdu(session.pdu_session_nas_pdu.copy());
-      }
-    }
-
-    // Handle NAS PDUs from Initial Context Setup Request
-    if (request.nas_pdu.has_value()) {
-      handle_nas_pdu(request.nas_pdu.value().copy());
-    }
   } else {
     // Handle NAS PDUs from Initial Context Setup Request
     if (request.nas_pdu.has_value()) {

lib/ngap/ngap_impl.cpp

@@ -514,7 +514,7 @@ void ngap_impl::handle_pdu_session_resource_setup_request(const asn1::ngap::pdu_
 
   // start routine
   ue->schedule_async_task(launch_async<ngap_pdu_session_resource_setup_procedure>(
-      msg, request, ue_ctxt.ue_ids, ue->get_rrc_ue_pdu_notifier(), cu_cp_notifier, *tx_pdu_notifier, ue_ctxt.logger));
+      msg, request, ue_ctxt.ue_ids, cu_cp_notifier, *tx_pdu_notifier, ue_ctxt.logger));
 }
 
 void ngap_impl::handle_pdu_session_resource_modify_request(const asn1::ngap::pdu_session_res_modify_request_s& request)

lib/ngap/procedures/ngap_pdu_session_resource_setup_procedure.cpp

@@ -10,7 +10,6 @@
 
 #include "ngap_pdu_session_resource_setup_procedure.h"
 #include "../ngap/ngap_asn1_helpers.h"
-#include "ngap_procedure_helpers.h"
 #include "srsran/asn1/ngap/common.h"
 #include "srsran/ngap/ngap.h"
 #include "srsran/ngap/ngap_message.h"
@@ -23,14 +22,12 @@ ngap_pdu_session_resource_setup_procedure::ngap_pdu_session_resource_setup_proce
     const cu_cp_pdu_session_resource_setup_request&    request_,
     const asn1::ngap::pdu_session_res_setup_request_s& asn1_request_,
     const ngap_ue_ids&                                 ue_ids_,
-    ngap_rrc_ue_pdu_notifier&                          rrc_ue_pdu_notifier_,
     ngap_cu_cp_notifier&                               cu_cp_notifier_,
     ngap_message_notifier&                             amf_notif_,
     ngap_ue_logger&                                    logger_) :
   request(request_),
   asn1_request(asn1_request_),
   ue_ids(ue_ids_),
-  rrc_ue_pdu_notifier(rrc_ue_pdu_notifier_),
   cu_cp_notifier(cu_cp_notifier_),
   amf_notifier(amf_notif_),
   logger(logger_)
@@ -50,14 +47,14 @@ void ngap_pdu_session_resource_setup_procedure::operator()(coro_context<async_ta
     logger.log_info("Validation of PduSessionResourceSetupRequest failed");
     response = verification_outcome.response;
   } else {
-    // Handle mandatory IEs
-    CORO_AWAIT_VALUE(response, cu_cp_notifier.on_new_pdu_session_resource_setup_request(verification_outcome.request));
-
-    // TODO: Handle optional IEs
+    // Add NAS PDU to PDU Session Resource Setup Request
     if (asn1_request->nas_pdu_present) {
-      handle_nas_pdu(logger, asn1_request->nas_pdu.copy(), rrc_ue_pdu_notifier);
+      verification_outcome.request.nas_pdu = asn1_request->nas_pdu.copy();
     }
 
+    // Handle mandatory IEs
+    CORO_AWAIT_VALUE(response, cu_cp_notifier.on_new_pdu_session_resource_setup_request(verification_outcome.request));
+
     // Combine validation response with DU processor response
     combine_pdu_session_resource_setup_response();
   }

lib/ngap/procedures/ngap_pdu_session_resource_setup_procedure.h

@@ -24,7 +24,6 @@ class ngap_pdu_session_resource_setup_procedure
   ngap_pdu_session_resource_setup_procedure(const cu_cp_pdu_session_resource_setup_request&    request_,
                                             const asn1::ngap::pdu_session_res_setup_request_s& asn1_request_,
                                             const ngap_ue_ids&                                 ue_ids_,
-                                            ngap_rrc_ue_pdu_notifier&                          rrc_ue_pdu_notifier_,
                                             ngap_cu_cp_notifier&                               cu_cp_notifier_,
                                             ngap_message_notifier&                             amf_notif_,
                                             ngap_ue_logger&                                    logger_);
@@ -44,7 +43,6 @@ class ngap_pdu_session_resource_setup_procedure
   cu_cp_pdu_session_resource_setup_response         validation_response;
   byte_buffer                                       nas_pdu;
   const ngap_ue_ids                                 ue_ids;
-  ngap_rrc_ue_pdu_notifier&                         rrc_ue_pdu_notifier;
   cu_cp_pdu_session_resource_setup_response         response;
   ngap_cu_cp_notifier&                              cu_cp_notifier;
   ngap_message_notifier&                            amf_notifier;