Update Deregistration Request (UE originating)

src/amf-app/amf_n1.cpp

@@ -3011,8 +3011,9 @@ void amf_n1::ue_initiate_de_registration_handle(
   }
 
   // Decode NAS message
-  auto dereg_request = std::make_unique<DeregistrationRequest>();
-  dereg_request->Decode(NULL, (uint8_t*) bdata(nas), blength(nas));
+  auto dereg_request = std::make_unique<DeregistrationRequest>(
+      true);  // UE originating de-registration
+  dereg_request->Decode((uint8_t*) bdata(nas), blength(nas));
 
   // TODO: validate 5G Mobile Identity
   uint8_t mobile_id_type = 0;

src/nas/ies/5GSRegistrationType.hpp

@@ -24,7 +24,6 @@
 
 #include "Type1NasIeFormatTv.hpp"
 
-#include <stdint.h>
 constexpr auto k5gsRegistrationTypeName = "5GS Registration Type";
 
 namespace nas {

src/nas/ies/_5GSDeregistrationType.cpp

@@ -18,14 +18,6 @@
  * For more information about the OpenAirInterface (OAI) Software Alliance:
  *      contact@openairinterface.org
  */
-
-/*! \file
- \brief
- \author
- \date 2020
- \email: contact@openairinterface.org
- */
-
 #include "_5GSDeregistrationType.hpp"
 
 #include "3gpp_24.501.hpp"
@@ -34,13 +26,23 @@
 using namespace nas;
 
 //------------------------------------------------------------------------------
-_5GSDeregistrationType::_5GSDeregistrationType() {
+_5GSDeregistrationType::_5GSDeregistrationType() : Type1NasIeFormatTv() {
   u1.b = 0;
+  SetIeName(k5gsDeregistrationTypeIeName);
 }
 
 //------------------------------------------------------------------------------
-_5GSDeregistrationType::_5GSDeregistrationType(uint8_t type) {
-  u1.b = type;
+_5GSDeregistrationType::_5GSDeregistrationType(uint8_t iei)
+    : Type1NasIeFormatTv(iei) {
+  u1.bf.iei = iei;
+  SetIeName(k5gsDeregistrationTypeIeName);
+}
+
+//------------------------------------------------------------------------------
+_5GSDeregistrationType::_5GSDeregistrationType(uint8_t iei, uint8_t value) {
+  u1.b = (iei << 4) | (value && 0x0f);
+  SetValue(value && 0x0f);
+  SetIeName(k5gsDeregistrationTypeIeName);
 }
 //------------------------------------------------------------------------------
 _5GSDeregistrationType::_5GSDeregistrationType(
@@ -50,11 +52,29 @@ _5GSDeregistrationType::_5GSDeregistrationType(
   u1.bf.re_registration_required = type.re_registration_required;
   u1.bf.access_type              = type.access_type;
   u1.bf.iei                      = type.iei;
+  if (type.iei != 0) {
+    SetIei(type.iei);
+  }
+  SetValue(u1.b && 0x0f);
+  SetIeName(k5gsDeregistrationTypeIeName);
 }
 
 //------------------------------------------------------------------------------
 _5GSDeregistrationType::~_5GSDeregistrationType() {}
 
+//------------------------------------------------------------------------------
+void _5GSDeregistrationType::setValue() {
+  Type1NasIeFormatTv::SetValue(u1.b && 0x0f);
+}
+
+//------------------------------------------------------------------------------
+void _5GSDeregistrationType::getValue() {
+  u1.b = Type1NasIeFormatTv::GetValue() && 0x0f;
+  if (iei_.has_value()) {
+    u1.b |= iei_.value() && 0xf0;
+  }
+}
+
 //------------------------------------------------------------------------------
 void _5GSDeregistrationType::set(_5gs_deregistration_type_t type) {
   u1.b                           = 0;
@@ -62,6 +82,10 @@ void _5GSDeregistrationType::set(_5gs_deregistration_type_t type) {
   u1.bf.re_registration_required = type.re_registration_required;
   u1.bf.access_type              = type.access_type;
   u1.bf.iei                      = type.iei;
+  if (type.iei != 0) {
+    SetIei(type.iei);
+  }
+  SetValue(u1.b && 0x0f);
 }
 
 //------------------------------------------------------------------------------
@@ -82,6 +106,7 @@ void _5GSDeregistrationType::get(uint8_t& type) {
   type = u1.b;
 }
 
+/*
 //------------------------------------------------------------------------------
 int _5GSDeregistrationType::Encode(uint8_t* buf, int len) {
   Logger::nas_mm().error("Encoding 5GSDeregistrationType IE");
@@ -102,3 +127,4 @@ int _5GSDeregistrationType::Decode(uint8_t* buf, int len) {
   Logger::nas_mm().debug("Decoded 5GSDeRegistrationType");
   return 0;
 }
+*/

src/nas/ies/_5GSDeregistrationType.hpp

@@ -19,17 +19,10 @@
  *      contact@openairinterface.org
  */
 
-/*! \file
- \brief
- \author
- \date 2020
- \email: contact@openairinterface.org
- */
-
 #ifndef _5GS_DEREGISTRATION_TYPE_H_
 #define _5GS_DEREGISTRATION_TYPE_H_
 
-#include <stdint.h>
+#include "Type1NasIeFormatTv.hpp"
 
 namespace nas {
 typedef struct _5gs_deregistration_type_s {
@@ -39,21 +32,32 @@ typedef struct _5gs_deregistration_type_s {
   uint8_t access_type : 2;
 } _5gs_deregistration_type_t;
 
-class _5GSDeregistrationType {
+constexpr auto k5gsDeregistrationTypeIeName = "5GS De-registration Type";
+
+class _5GSDeregistrationType : public Type1NasIeFormatTv {
  public:
   _5GSDeregistrationType();
-  _5GSDeregistrationType(uint8_t type);
+  _5GSDeregistrationType(uint8_t iei);
+  _5GSDeregistrationType(uint8_t iei, uint8_t value);
   _5GSDeregistrationType(_5gs_deregistration_type_t type);
   ~_5GSDeregistrationType();
-  int Decode(uint8_t* buf, int len);
-  int Encode(uint8_t* buf, int len);
+
+  // int Decode(uint8_t* buf, int len);
+  // int Encode(uint8_t* buf, int len);
 
   void set(_5gs_deregistration_type_t type);
   void get(_5gs_deregistration_type_t& type);
-  void set(uint8_t type);
-  void get(uint8_t& type);
 
- public:
+  void set(uint8_t value);
+  void get(uint8_t& value);
+
+  void set(uint8_t iei, uint8_t value);
+  void get(uint8_t& iei, uint8_t value);
+
+ private:
+  void setValue();
+  void getValue();
+
   union {
     struct {
       uint8_t iei : 4;

src/nas/msgs/DeregistrationRequest.hpp

@@ -27,13 +27,16 @@
 using namespace std;
 namespace nas {
 
-class DeregistrationRequest {
+class DeregistrationRequest : public NasMmPlainHeader {
  public:
-  DeregistrationRequest();
+  DeregistrationRequest(bool is_ue_originating);
   ~DeregistrationRequest();
+
   int Encode(uint8_t* buf, int len);
-  int Decode(NasMmPlainHeader* header, uint8_t* buf, int len);
+  int Decode(uint8_t* buf, int len);
+
   void SetHeader(uint8_t security_header_type);
+
   void setDeregistrationType(uint8_t dereg_type);
   void setDeregistrationType(_5gs_deregistration_type_t type);
   void SetNgKsi(uint8_t tsc, uint8_t key_set_id);
@@ -57,10 +60,9 @@ class DeregistrationRequest {
   bool getSuciSupiFormatImsi(nas::SUCI_imsi_t& imsi);
 
  public:
-  NasMmPlainHeader* plain_header;
-  _5GSDeregistrationType* ie_deregistrationtype;
-  NasKeySetIdentifier* ie_ngKSI;
-  _5GSMobileIdentity* ie_5gs_mobility_id;
+  _5GSDeregistrationType ie_deregistrationtype;  // Mandatory
+  NasKeySetIdentifier ie_ngKSI;                  // Mandatory
+  _5GSMobileIdentity ie_5gs_mobility_id;         // Mandatory
 };
 
 }  // namespace nas

src/nas/msgs/NasMmPlainHeader.cpp

@@ -26,6 +26,9 @@
 
 using namespace nas;
 
+//------------------------------------------------------------------------------
+NasMmPlainHeader::NasMmPlainHeader(const uint8_t& epd) : epd_(epd) {}
+
 //------------------------------------------------------------------------------
 NasMmPlainHeader::NasMmPlainHeader(const uint8_t& epd, const uint8_t& msg_type)
     : epd_(epd), msg_type_(msg_type) {}

src/nas/msgs/NasMmPlainHeader.hpp

@@ -33,6 +33,7 @@ namespace nas {
 class NasMmPlainHeader {
  public:
   NasMmPlainHeader(){};
+  NasMmPlainHeader(const uint8_t& epd);
   NasMmPlainHeader(const uint8_t& epd, const uint8_t& msg_type);
   virtual ~NasMmPlainHeader();