Code refactor for 5GMMCapability

src/amf-app/amf_n1.cpp

@@ -1285,8 +1285,8 @@ void amf_n1::registration_request_handle(
   // Get non-current native NAS key set identity (Optional IE), used for
   // inter-system change from S1 to N1 Get 5GMM Capability IE (optional), not
   // included for periodic registration updating procedure
-  uint8_t _5g_mm_cap = registration_request->get5GMMCapability();
-  if (_5g_mm_cap == -1) {
+  uint8_t _5g_mm_cap = 0;
+  if (!registration_request->get5GMMCapability(_5g_mm_cap)) {
     Logger::amf_n1().warn("No Optional IE 5GMMCapability available");
   }
   nc->mmCapability = _5g_mm_cap;

src/nas/ies/5GMMCapability.cpp

@@ -21,6 +21,7 @@
 
 #include "5GMMCapability.hpp"
 
+#include "3gpp_24.501.hpp"
 #include "common_defs.h"
 #include "logger.hpp"
 
@@ -79,6 +80,15 @@ int _5GMMCapability::encode2Buffer(uint8_t* buf, int len) {
 
 //------------------------------------------------------------------------------
 int _5GMMCapability::decodeFromBuffer(uint8_t* buf, int len, bool is_option) {
+  if ((len < k5gmmCapabilityMinimumLength) or
+      (len > k5gmmCapabilityMaximumLength)) {
+    Logger::nas_mm().error(
+        "Buffer length is less than the minimum/or greater than the maximum "
+        "length of this IE (Min %d octet, Max %d octet)",
+        k5gmmCapabilityMinimumLength, k5gmmCapabilityMaximumLength);
+    return KEncodeDecodeError;
+  }
+
   uint8_t decoded_size = 0;
 
   Logger::nas_mm().debug("Decoding _5GMMCapability IEI (0x%x)", *buf);

src/nas/msgs/RegistrationRequest.cpp

@@ -31,7 +31,7 @@ using namespace nas;
 RegistrationRequest::RegistrationRequest()
     : NasMmPlainHeader(EPD_5GS_MM_MSG, REGISTRATION_REQUEST) {
   ie_non_current_native_nas_ksi  = std::nullopt;
-  ie_5g_mm_capability            = nullptr;
+  ie_5g_mm_capability            = std::nullopt;
   ie_ue_security_capability      = nullptr;
   ie_requested_NSSAI             = nullptr;
   ie_s1_ue_network_capability    = nullptr;
@@ -176,7 +176,7 @@ void RegistrationRequest::setIMEI_IMEISV() {}
 void RegistrationRequest::set5G_S_TMSI() {}
 
 //------------------------------------------------------------------------------
-void RegistrationRequest::setNon_current_native_nas_ksi(
+void RegistrationRequest::setNonCurrentNativeNasKSI(
     uint8_t tsc, uint8_t key_set_id) {
   ie_non_current_native_nas_ksi =
       std::make_optional<NasKeySetIdentifier>(0xC, tsc, key_set_id);
@@ -196,15 +196,16 @@ bool RegistrationRequest::getNonCurrentNativeNasKSI(uint8_t& value) const {
 
 //------------------------------------------------------------------------------
 void RegistrationRequest::set5G_MM_capability(uint8_t value) {
-  ie_5g_mm_capability = new _5GMMCapability(0x10, value);
+  ie_5g_mm_capability = std::make_optional<_5GMMCapability>(0x10, value);
 }
 
 //------------------------------------------------------------------------------
-uint8_t RegistrationRequest::get5GMMCapability() {
-  if (ie_5g_mm_capability)
-    return ie_5g_mm_capability->getValue();
-  else
-    return 0;
+bool RegistrationRequest::get5GMMCapability(uint8_t& value) {
+  if (ie_5g_mm_capability.has_value()) {
+    value = ie_5g_mm_capability.value().getValue();
+    return true;
+  } else
+    return false;
 }
 
 //------------------------------------------------------------------------------
@@ -562,10 +563,10 @@ int RegistrationRequest::encode2Buffer(uint8_t* buf, int len) {
       Logger::nas_mm().error("Encoding IE_non_current_native_nas_ksi  error");
     }
   }
-  if (!ie_5g_mm_capability) {
+  if (!ie_5g_mm_capability.has_value()) {
     Logger::nas_mm().warn("IE ie_5g_mm_capability is not available");
   } else {
-    if (int size = ie_5g_mm_capability->encode2Buffer(
+    if (int size = ie_5g_mm_capability.value().encode2Buffer(
             buf + encoded_size, len - encoded_size)) {
       encoded_size += size;
     } else {
@@ -803,6 +804,7 @@ int RegistrationRequest::encode2Buffer(uint8_t* buf, int len) {
 int RegistrationRequest::decodeFromBuffer(uint8_t* buf, int len) {
   Logger::nas_mm().debug("Decoding RegistrationRequest message");
   int decoded_size    = 0;
+  int decoded_size_ie = 0;
   int decoded_result  = 0;
   // plain_header           = header;
   decoded_size = NasMmPlainHeader::decodeFromBuffer(buf, len);
@@ -859,10 +861,16 @@ int RegistrationRequest::decodeFromBuffer(uint8_t* buf, int len) {
     }
     switch (octet) {
       case 0x10: {
-        Logger::nas_mm().debug("Decoding IEI (0x10)");
-        ie_5g_mm_capability = new _5GMMCapability();
-        decoded_size += ie_5g_mm_capability->decodeFromBuffer(
-            buf + decoded_size, len - decoded_size, true);
+        Logger::nas_mm().debug("Decoding 5GMMCapability (IEI 0x10)");
+        _5GMMCapability ie_5g_mm_capability_tmp = {};
+        if ((decoded_size_ie = ie_5g_mm_capability_tmp.decodeFromBuffer(
+                 buf + decoded_size, len - decoded_size, true)) ==
+            KEncodeDecodeError) {
+          return KEncodeDecodeError;
+        }
+        decoded_size += decoded_size_ie;
+        ie_5g_mm_capability =
+            std::optional<_5GMMCapability>(ie_5g_mm_capability_tmp);
         octet = *(buf + decoded_size);
         Logger::nas_mm().debug("Next IEI 0x%x", octet);
       } break;

src/nas/msgs/RegistrationRequest.hpp

@@ -71,11 +71,11 @@ class RegistrationRequest : public NasMmPlainHeader {
       uint8_t amf_set_id, uint8_t amf_pointer, const string _5g_tmsi);
   bool getAdditionalGuti(nas::_5G_GUTI_t& guti);
 
-  void setNon_current_native_nas_ksi(uint8_t tsc, uint8_t key_set_id);
+  void setNonCurrentNativeNasKSI(uint8_t tsc, uint8_t key_set_id);
   bool getNonCurrentNativeNasKSI(uint8_t& value) const;
 
   void set5G_MM_capability(uint8_t value);
-  uint8_t get5GMMCapability();
+  bool get5GMMCapability(uint8_t& value);
 
   void setUE_Security_Capability(uint8_t g_EASel, uint8_t g_IASel);
   void setUE_Security_Capability(
@@ -152,7 +152,7 @@ class RegistrationRequest : public NasMmPlainHeader {
   _5GSMobileIdentity ie_5gs_mobility_id;        // Mandatory
 
   std::optional<NasKeySetIdentifier> ie_non_current_native_nas_ksi;  // Optional
-  _5GMMCapability* ie_5g_mm_capability;                              // Optional
+  std::optional<_5GMMCapability> ie_5g_mm_capability;                // Optional
   UESecurityCapability* ie_ue_security_capability;                   // Optional
   NSSAI* ie_requested_NSSAI;                                         // Optional
   // TODO: Last visited registered TAI