PS list included in UEContextReleaseRequest

src/gnb/ngap/context.cpp

@@ -16,6 +16,7 @@
 #include <asn/ngap/ASN_NGAP_InitialContextSetupRequest.h>
 #include <asn/ngap/ASN_NGAP_InitialContextSetupResponse.h>
 #include <asn/ngap/ASN_NGAP_NGAP-PDU.h>
+#include <asn/ngap/ASN_NGAP_PDUSessionResourceItemCxtRelReq.h>
 #include <asn/ngap/ASN_NGAP_ProtocolIE-Field.h>
 #include <asn/ngap/ASN_NGAP_SuccessfulOutcome.h>
 #include <asn/ngap/ASN_NGAP_UE-NGAP-ID-pair.h>
@@ -117,13 +118,37 @@ void NgapTask::sendContextRelease(int ueId, NgapCause cause)
 {
     m_logger->debug("Sending UE Context release request (NG-RAN node initiated)");
 
+    auto *ue = findUeContext(ueId);
+    if (ue == nullptr)
+        return;
+
+    std::vector<ASN_NGAP_UEContextReleaseRequest_IEs *> ies;
+
+    if (!ue->pduSessions.empty())
+    {
+        auto *ieSessionList = asn::New<ASN_NGAP_UEContextReleaseRequest_IEs>();
+        ieSessionList->id = ASN_NGAP_ProtocolIE_ID_id_PDUSessionResourceListCxtRelReq;
+        ieSessionList->criticality = ASN_NGAP_Criticality_reject;
+        ieSessionList->value.present = ASN_NGAP_UEContextReleaseRequest_IEs__value_PR_PDUSessionResourceListCxtRelReq;
+
+        for (int psi : ue->pduSessions)
+        {
+            auto *sessionItem = asn::New<ASN_NGAP_PDUSessionResourceItemCxtRelReq>();
+            sessionItem->pDUSessionID = static_cast<ASN_NGAP_PDUSessionID_t>(psi);
+            asn::SequenceAdd(ieSessionList->value.choice.PDUSessionResourceListCxtRelReq, sessionItem);
+        }
+
+        ies.push_back(ieSessionList);
+    }
+
     auto *ieCause = asn::New<ASN_NGAP_UEContextReleaseRequest_IEs>();
     ieCause->id = ASN_NGAP_ProtocolIE_ID_id_Cause;
     ieCause->criticality = ASN_NGAP_Criticality_ignore;
     ieCause->value.present = ASN_NGAP_UEContextReleaseRequest_IEs__value_PR_Cause;
     ngap_utils::ToCauseAsn_Ref(cause, ieCause->value.choice.Cause);
+    ies.push_back(ieCause);
 
-    auto *pdu = asn::ngap::NewMessagePdu<ASN_NGAP_UEContextReleaseRequest>({ieCause});
+    auto *pdu = asn::ngap::NewMessagePdu<ASN_NGAP_UEContextReleaseRequest>(ies);
     sendNgapUeAssociated(ueId, pdu);
 }
 

src/gnb/ngap/session.cpp

@@ -106,7 +106,7 @@ void NgapTask::receiveSessionResourceSetupRequest(int amfId, ASN_NGAP_PDUSession
                 resource->qosFlows = asn::WrapUnique(ptr, asn_DEF_ASN_NGAP_QosFlowSetupRequestList);
             }
 
-            auto error = setupPduSessionResource(resource);
+            auto error = setupPduSessionResource(ue, resource);
             if (error.has_value())
             {
                 auto *tr = asn::New<ASN_NGAP_PDUSessionResourceSetupUnsuccessfulTransfer>();
@@ -213,7 +213,7 @@ void NgapTask::receiveSessionResourceSetupRequest(int amfId, ASN_NGAP_PDUSession
                       static_cast<int>(successList.size()), static_cast<int>(failedList.size()));
 }
 
-std::optional<NgapCause> NgapTask::setupPduSessionResource(PduSessionResource *resource)
+std::optional<NgapCause> NgapTask::setupPduSessionResource(NgapUeContext *ue, PduSessionResource *resource)
 {
     if (resource->sessionType != PduSessionType::IPv4)
     {
@@ -242,6 +242,8 @@ std::optional<NgapCause> NgapTask::setupPduSessionResource(PduSessionResource *r
     w->resource = resource;
     m_base->gtpTask->push(w);
 
+    ue->pduSessions.insert(resource->psi);
+
     return {};
 }
 
@@ -283,6 +285,8 @@ void NgapTask::receiveSessionResourceReleaseCommand(int amfId, ASN_NGAP_PDUSessi
         w->ueId = ue->ctxId;
         w->psi = psi;
         m_base->gtpTask->push(w);
+
+        ue->pduSessions.erase(psi);
     }
 
     for (auto &psi : psIds)

src/gnb/ngap/task.hpp

@@ -108,7 +108,7 @@ class NgapTask : public NtsTask
     /* PDU session management */
     void receiveSessionResourceSetupRequest(int amfId, ASN_NGAP_PDUSessionResourceSetupRequest *msg);
     void receiveSessionResourceReleaseCommand(int amfId, ASN_NGAP_PDUSessionResourceReleaseCommand *msg);
-    std::optional<NgapCause> setupPduSessionResource(PduSessionResource *resource);
+    std::optional<NgapCause> setupPduSessionResource(NgapUeContext* ue, PduSessionResource *resource);
 
     /* UE context management */
     void receiveInitialContextSetup(int amfId, ASN_NGAP_InitialContextSetupRequest *msg);

src/gnb/types.hpp

@@ -8,6 +8,8 @@
 
 #pragma once
 
+#include <set>
+
 #include <lib/app/monitor.hpp>
 #include <lib/asn/utils.hpp>
 #include <utils/common_types.hpp>
@@ -132,6 +134,7 @@ struct NgapUeContext
     int uplinkStream{};
     int downlinkStream{};
     AggregateMaximumBitRate ueAmbr{};
+    std::set<int> pduSessions{};
 
     explicit NgapUeContext(int ctxId) : ctxId(ctxId)
     {