Update DL NAS Transport

src/nas/ies/Payload_Container.cpp

@@ -96,12 +96,11 @@ Payload_Container::Payload_Container(
 //------------------------------------------------------------------------------
 Payload_Container::~Payload_Container() {}
 
-/*
 //------------------------------------------------------------------------------
-void Payload_Container::setValue(uint8_t iei, uint8_t value) {
-  _iei = iei;
+void Payload_Container::SetValue(const bstring& cnt) {
+  content = std::optional<bstring>(cnt);
+  SetLengthIndicator(blength(cnt));
 }
-*/
 
 //------------------------------------------------------------------------------
 void Payload_Container::SetValue(

src/nas/ies/Payload_Container.hpp

@@ -55,9 +55,11 @@ class Payload_Container : Type6NasIe {
   int Encode(uint8_t* buf, int len, uint8_t type);
   int Decode(uint8_t* buf, int len, bool is_iei, uint8_t type);
 
+  void SetValue(const bstring& cnt);
+  bool GetValue(bstring& cnt) const;
+
   void SetValue(const std::vector<PayloadContainerEntry>& content);
   bool GetValue(std::vector<PayloadContainerEntry>& content) const;
-  bool GetValue(bstring& cnt) const;
 
  private:
   std::optional<bstring> content;

src/nas/msgs/DLNASTransport.hpp

@@ -26,7 +26,7 @@
 
 namespace nas {
 
-class DLNASTransport {
+class DLNASTransport : public NasMmPlainHeader {
  public:
   DLNASTransport();
   ~DLNASTransport();
@@ -34,7 +34,7 @@ class DLNASTransport {
   void SetHeader(uint8_t security_header_type);
 
   int Encode(uint8_t* buf, int len);
-  int Decode(NasMmPlainHeader* header, uint8_t* buf, int len);
+  int Decode(uint8_t* buf, int len);
 
   void SetPayloadContainerType(uint8_t value);
 
@@ -42,18 +42,24 @@ class DLNASTransport {
   void SetPayloadContainer(uint8_t* buf, int len);
 
   void SetPduSessionId(uint8_t value);
+  // TODO: Get
+
   void SetAdditionalInformation(const bstring& value);
+  // TODO: Get
+
   void Set5gmmCause(uint8_t value);
+  // TODO: Get
+
   void SetBackOffTimerValue(uint8_t unit, uint8_t value);
+  // TODO: Get
 
  public:
-  NasMmPlainHeader* plain_header;
-  PayloadContainerType* ie_payload_container_type;
-  Payload_Container* ie_payload_container;
-  PduSessionIdentity2* ie_pdu_session_identity_2;
-  AdditionalInformation* ie_additional_information;
-  _5GMM_Cause* ie_5gmm_cause;
-  GprsTimer3* ie_back_off_timer_value;
+  PayloadContainerType ie_payload_container_type;                  // Mandatory
+  Payload_Container ie_payload_container;                          // Mandatory
+  std::optional<PduSessionIdentity2> ie_pdu_session_identity_2;    // Optional
+  std::optional<AdditionalInformation> ie_additional_information;  // Optional
+  std::optional<_5GMM_Cause> ie_5gmm_cause;                        // Optional
+  std::optional<GprsTimer3> ie_back_off_timer_value;               // Optional
 };
 
 }  // namespace nas