sm: update---#ifndef...#define...#endif

src/nas/sm/msg/PDUSessionEstablishmentAccept.h

+#ifndef _PDUSESSIONESTABLISHMENTACCEPT_H_
+#define _PDUSESSIONESTABLISHMENTACCEPT_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -111,3 +114,5 @@ typedef struct pdu_session_establishment_accept_msg_tag{
 
 int decode_pdu_session_establishment_accept(pdu_session_establishment_accept_msg *pdusessionestablishmentaccept, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_establishment_accept(pdu_session_establishment_accept_msg *pdusessionestablishmentaccept, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionEstablishmentReject.h

+#ifndef _PDUSESSIONESTABLISHMENTREJECT_H_
+#define _PDUSESSIONESTABLISHMENTREJECT_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -68,3 +71,5 @@ typedef struct pdu_session_establishment_reject_msg_tag{
 
 int decode_pdu_session_establishment_reject(pdu_session_establishment_reject_msg *pdusessionestablishmentreject, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_establishment_reject(pdu_session_establishment_reject_msg *pdusessionestablishmentreject, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionEstablishmentRequest.h

+#ifndef _PDUSESSIONESTABLISHMENTREQUEST_H_
+#define _PDUSESSIONESTABLISHMENTREQUEST_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -82,3 +85,5 @@ typedef struct pdu_session_establishment_request_msg_tag{
 
 int decode_pdu_session_establishment_request(pdu_session_establishment_request_msg *pdusessionestablishmentrequest, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_establishment_request(pdu_session_establishment_request_msg *pdusessionestablishmentrequest, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionModificationCommand.h

+#ifndef _PDUSESSIONMODIFICATIONCOMMAND_H_
+#define _PDUSESSIONMODIFICATIONCOMMAND_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -84,3 +87,5 @@ typedef struct pdu_session_modification_command_msg_tag{
 
 int decode_pdu_session_modification_command(pdu_session_modification_command_msg *pdusessionmodificationcommand, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_modification_command(pdu_session_modification_command_msg *pdusessionmodificationcommand, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionModificationCommandReject.h

+#ifndef _PDUSESSIONMODIFICATIONCOMMANDREJECT_H_
+#define _PDUSESSIONMODIFICATIONCOMMANDREJECT_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -44,3 +47,5 @@ typedef struct pdu_session_modification_command_reject_msg_tag{
 
 int decode_pdu_session_modification_command_reject(pdu_session_modification_command_reject_msg *pdusessionmodificationcommandreject, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_modification_command_reject(pdu_session_modification_command_reject_msg *pdusessionmodificationcommandreject, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionModificationComplete.h

+#ifndef _PDUSESSIONMODIFICATIONCOMPLETE_H_
+#define _PDUSESSIONMODIFICATIONCOMPLETE_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -40,3 +43,5 @@ typedef struct pdu_session_modification_complete_msg_tag{
 
 int decode_pdu_session_modification_complete(pdu_session_modification_complete_msg *pdusessionmodificationcomplete, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_modification_complete(pdu_session_modification_complete_msg *pdusessionmodificationcomplete, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionModificationReject.h

+#ifndef _PDUSESSIONMODIFICATIONREJECT_H_
+#define _PDUSESSIONMODIFICATIONREJECT_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -56,3 +59,5 @@ typedef struct pdu_session_modification_reject_msg_tag{
 
 int decode_pdu_session_modification_reject(pdu_session_modification_reject_msg *pdusessionmodificationreject, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_modification_reject(pdu_session_modification_reject_msg *pdusessionmodificationreject, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionModificationRequest.h

+#ifndef _PDUSESSIONMODIFICATIONREQUEST_H_
+#define _PDUSESSIONMODIFICATIONREQUEST_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -91,3 +94,5 @@ typedef struct pdu_session_modification_request_msg_tag{
 
 int decode_pdu_session_modification_request(pdu_session_modification_request_msg *pdusessionmodificationrequest, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_modification_request(pdu_session_modification_request_msg *pdusessionmodificationrequest, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionReleaseCommand.h

+#ifndef _PDUSESSIONRELEASECOMMAND_H_
+#define _PDUSESSIONRELEASECOMMAND_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -61,3 +64,5 @@ typedef struct pdu_session_release_command_msg_tag{
 
 int decode_pdu_session_release_command(pdu_session_release_command_msg *pdusessionreleasecommand, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_release_command(pdu_session_release_command_msg *pdusessionreleasecommand, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionReleaseComplete.h

+#ifndef _PDUSESSIONRELEASECOMPLETE_H_
+#define _PDUSESSIONRELEASECOMPLETE_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -47,3 +50,5 @@ typedef struct pdu_session_release_complete_msg_tag{
 
 int decode_pdu_session_release_complete(pdu_session_release_complete_msg *pdusessionreleasecomplete, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_release_complete(pdu_session_release_complete_msg *pdusessionreleasecomplete, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionReleaseReject.h

+#ifndef _PDUSESSIONRELEASEREJECT_H_
+#define _PDUSESSIONRELEASEREJECT_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -44,3 +47,5 @@ typedef struct pdu_session_release_reject_msg_tag{
 
 int decode_pdu_session_release_reject(pdu_session_release_reject_msg *pdusessionreleasereject, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_release_reject(pdu_session_release_reject_msg *pdusessionreleasereject, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/PDUSessionReleaseRequest.h

+#ifndef _PDUSESSIONRELEASEREQUEST_H_
+#define _PDUSESSIONRELEASEREQUEST_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -48,3 +51,5 @@ typedef struct pdu_session_release_request_msg_tag{
 
 int decode_pdu_session_release_request(pdu_session_release_request_msg *pdusessionreleaserequest, uint8_t *buffer, uint32_t len);
 int encode_pdu_session_release_request(pdu_session_release_request_msg *pdusessionreleaserequest, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/_5GSMStatus.h

+#ifndef __5GSMSTATUS_H_
+#define __5GSMSTATUS_H_
+
 #include <stdint.h>
 
 #include "ExtendedProtocolDiscriminator.h"
@@ -36,3 +39,5 @@ typedef struct _5gsm_status_msg_tag{
 
 int decode__5gsm_status(_5gsm_status_msg *_5gsmstatus, uint8_t *buffer, uint32_t len);
 int encode__5gsm_status(_5gsm_status_msg *_5gsmstatus, uint8_t *buffer, uint32_t len);
+
+#endif

src/nas/sm/msg/sm_msg.c

@@ -65,6 +65,7 @@ sm_msg_decode (
 
     //OAILOG_ERROR (LOG_NAS, "ESM-MSG   - Failed to decode ESM message header " "(%d)\n", header_result);
     //OAILOG_FUNC_RETURN (LOG_NAS, header_result);
+    return header_result;
   }
 
   buffer += header_result;
@@ -118,7 +119,7 @@ sm_msg_decode (
       case PDU_SESSION_RELEASE_COMPLETE:
 	  	   decode_result = decode_pdu_session_release_complete(&msg->specific_msg.pdu_session_release_complete, buffer, len);
 	  break;
-	  case _5GSM_STATUS:
+	  case _5GSM_STAUS:
 	  	   decode_result = decode__5gsm_status(&msg->specific_msg._5gsm_status, buffer, len);
 	  break;
 
@@ -131,6 +132,7 @@ sm_msg_decode (
   if (decode_result < 0) {
     //OAILOG_ERROR (LOG_NAS, "SM-MSG   - Failed to decode L3 ESM message 0x%x " "(%u)\n", msg->header.message_type, decode_result);
     //OAILOG_FUNC_RETURN (LOG_NAS, decode_result);
+    return decode_result;
   } else {
     /*
      * Message has been decoded and security header removed, handle it has a
@@ -233,7 +235,7 @@ fivegsm_msg_encode (
       case PDU_SESSION_RELEASE_COMPLETE:
 	  	   encode_result = encode_pdu_session_release_complete(&msg->specific_msg.pdu_session_release_complete, buffer, len);
 	  break;
-	  case _5GSM_STATUS:
+	  case _5GSM_STAUS:
 	  	   encode_result = encode__5gsm_status(&msg->specific_msg._5gsm_status, buffer, len);
 	  break;