Code cleanup for Service Accept

src/amf-app/amf_n1.cpp

@@ -819,7 +819,7 @@ void amf_n1::service_request_handle(
   std::unique_ptr<ServiceRequest> service_request =
       std::make_unique<ServiceRequest>();
   int decoded_size =
-      service_request->Decode(nullptr, (uint8_t*) bdata(nas), blength(nas));
+      service_request->Decode((uint8_t*) bdata(nas), blength(nas));
   // bdestroy_wrapper(&nas);
 
   if (decoded_size != KEncodeDecodeError) {
@@ -947,7 +947,7 @@ void amf_n1::service_request_handle(
           std::unique_ptr<ServiceRequest> service_request_nas =
               std::make_unique<ServiceRequest>();
           service_request_nas->Decode(
-              nullptr, (uint8_t*) bdata(plain_msg), blength(plain_msg));
+              (uint8_t*) bdata(plain_msg), blength(plain_msg));
           bdestroy_wrapper(&plain_msg);
 
           if (!service_request_nas->GetPduSessionStatus(pdu_session_status)) {

src/nas/msgs/ServiceAccept.hpp

@@ -20,11 +20,9 @@
  */
 
 #ifndef _SERVICE_ACCEPT_H_
-
 #define _SERVICE_ACCEPT_H_
 
 #include <stdint.h>
-#include <string>
 
 #include "NasIeHeader.hpp"
 
@@ -50,20 +48,20 @@ class ServiceAccept : public NasMmPlainHeader {
       uint8_t session_id, uint8_t value);
   // TODO: Get
 
-  void SetEapMessage(bstring eap);
+  void SetEapMessage(const bstring& eap);
   // TODO: Get
 
   void SetT3448Value(uint8_t unit, uint8_t value);
   // TODO: Get
 
  private:
-  std::optional<PDUSessionStatus> ie_PDU_session_status;  // Optional
+  std::optional<PDUSessionStatus> ie_pdu_session_status;  // Optional
   std::optional<PDU_Session_Reactivation_Result>
       ie_pdu_session_reactivation_result;  // Optional
   std::optional<PDU_Session_Reactivation_Result_Error_Cause>
       ie_pdu_session_reactivation_result_error_cause;  // Optional
   std::optional<EapMessage> ie_eap_message;            // Optional
-  std::optional<GprsTimer3> ie_T3448_value;            // Optional
+  std::optional<GprsTimer3> ie_t3448_value;            // Optional
 };
 
 }  // namespace nas