Request Type IE handling improvement

src/lib/nas/enums.hpp

@@ -632,7 +632,6 @@ enum class ERequestType
     INITIAL_EMERGENCY_REQUEST = 0b011,
     EXISTING_EMERGENCY_PDU_SESSION = 0b100,
     MODIFICATION_REQUEST = 0b101,
-    RESERVED=0b111,
 };
 
 enum class EAllowedType

src/ue/nas/mm/transport.cpp

@@ -46,6 +46,13 @@ void NasMm::receiveDlNasTransport(const nas::DlNasTransport &msg)
         return;
     }
 
+    if (msg.payloadContainer.data.length() == 0)
+    {
+        m_logger->err("Empty payload container received with type[%d]",
+                      (int)msg.payloadContainerType.payloadContainerType);
+        return;
+    }
+
     OctetView buff{msg.payloadContainer.data.data(), static_cast<size_t>(msg.payloadContainer.data.length())};
     auto nasMessage = nas::DecodeNasMessage(buff);
 
@@ -131,7 +138,8 @@ EProcRc NasMm::deliverUlTransport(const nas::UlNasTransport &msg, ENasTransportH
     }
 
     // Perform UAC for PDU session establishment and modification
-    if (hint == ENasTransportHint::PDU_SESSION_ESTABLISHMENT_REQUEST || hint == ENasTransportHint::PDU_SESSION_MODIFICATION_REQUEST)
+    if (hint == ENasTransportHint::PDU_SESSION_ESTABLISHMENT_REQUEST ||
+        hint == ENasTransportHint::PDU_SESSION_MODIFICATION_REQUEST)
     {
         if (performUac() != EUacResult::ALLOWED)
         {

src/ue/nas/sm/transport.cpp

@@ -66,12 +66,13 @@ void NasSm::sendSmMessage(int psi, const nas::SmMessage &msg)
     nas::EncodeNasMessage(msg, m.payloadContainer.data);
     m.pduSessionId = nas::IEPduSessionIdentity2{};
     m.pduSessionId->value = psi;
+
+    if (msg.messageType == nas::EMessageType::PDU_SESSION_ESTABLISHMENT_REQUEST ||
+        msg.messageType == nas::EMessageType::PDU_SESSION_MODIFICATION_REQUEST)
+    {
         m.requestType = nas::IERequestType{};
         m.requestType->requestType =
             session->isEmergency ? nas::ERequestType::INITIAL_EMERGENCY_REQUEST : nas::ERequestType::INITIAL_REQUEST;
-    if (msg.messageType == nas::EMessageType::PDU_SESSION_RELEASE_REQUEST || msg.messageType == nas::EMessageType::PDU_SESSION_RELEASE_COMPLETE) {
-       m.requestType->requestType = nas::ERequestType::RESERVED;
-
     }
 
     if (!session->isEmergency)