From 8a844efa49ccaf6fa8e2b5203978a5131dc80066 Mon Sep 17 00:00:00 2001
From: Guido Casati <hello@guidocasati.com>
Date: Wed, 11 Dec 2024 12:47:43 +0100
Subject: [PATCH] Fix typo and rename NAS identity response

---
 openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.c | 2 +-
 openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.h | 7 +++----
 openair3/NAS/NR_UE/5GS/NR_NAS_defs.h                  | 2 +-
 openair3/NAS/NR_UE/5GS/fgs_nas_lib.c                  | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.c b/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.c
index 573d1022d5..f65279c355 100644
--- a/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.c
+++ b/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.c
@@ -31,7 +31,7 @@
 #include "FGSIdentityResponse.h"
 #include <stdint.h>
 
-int encode_identiy_response(fgs_identiy_response_msg *fgs_identity_reps, uint8_t *buffer, uint32_t len)
+int encode_fgmm_identity_response(uint8_t *buffer, const fgmm_identity_response_msg *fgs_identity_reps, uint32_t len)
 {
   int encoded = 0;
   int encode_result = 0;
diff --git a/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.h b/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.h
index 519e49410e..74cc6879a6 100644
--- a/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.h
+++ b/openair3/NAS/NR_UE/5GS/5GMM/MSG/FGSIdentityResponse.h
@@ -43,16 +43,15 @@
  * Direction: UE to AMF
  */
 
-typedef struct fgs_identiy_response_msg_tag {
+typedef struct fgmm_identity_response_msg_s {
   /* Mandatory fields */
   uint8_t protocoldiscriminator;
   SecurityHeaderType securityheadertype: 4;
   uint8_t sparehalfoctet: 4;
   MessageType messagetype;
   FGSMobileIdentity fgsmobileidentity;
+} fgmm_identity_response_msg;
 
-} fgs_identiy_response_msg;
-
-int encode_identiy_response(fgs_identiy_response_msg *fgs_identity_reps, uint8_t *buffer, uint32_t len);
+int encode_fgmm_identity_response(uint8_t *buffer, const fgmm_identity_response_msg *fgs_identity_reps, uint32_t len);
 
 #endif /* ! defined(FGS_IDENTITY_RESPONSE_H_) */
diff --git a/openair3/NAS/NR_UE/5GS/NR_NAS_defs.h b/openair3/NAS/NR_UE/5GS/NR_NAS_defs.h
index fd4fa2e1a8..206cdab279 100644
--- a/openair3/NAS/NR_UE/5GS/NR_NAS_defs.h
+++ b/openair3/NAS/NR_UE/5GS/NR_NAS_defs.h
@@ -264,7 +264,7 @@ typedef union {
   fgmm_msg_header_t header;
   registration_request_msg registration_request;
   fgs_service_request_msg_t service_request;
-  fgs_identiy_response_msg fgs_identity_response;
+  fgmm_identity_response_msg fgs_identity_response;
   fgs_authentication_response_msg fgs_auth_response;
   fgs_deregistration_request_ue_originating_msg fgs_deregistration_request_ue_originating;
   fgs_security_mode_complete_msg fgs_security_mode_complete;
diff --git a/openair3/NAS/NR_UE/5GS/fgs_nas_lib.c b/openair3/NAS/NR_UE/5GS/fgs_nas_lib.c
index 8585e4ef70..75f045846d 100644
--- a/openair3/NAS/NR_UE/5GS/fgs_nas_lib.c
+++ b/openair3/NAS/NR_UE/5GS/fgs_nas_lib.c
@@ -74,7 +74,7 @@ int mm_msg_encode(const MM_msg *mm_msg, uint8_t *buffer, uint32_t len)
       encode_result = encode_registration_request(&mm_msg->registration_request, buffer, len);
       break;
     case FGS_IDENTITY_RESPONSE:
-      encode_result = encode_identiy_response(&mm_msg->fgs_identity_response, buffer, len);
+      encode_result = encode_fgmm_identity_response(buffer, &mm_msg->fgs_identity_response, len);
       break;
     case FGS_AUTHENTICATION_RESPONSE:
       encode_result = encode_fgs_authentication_response(&mm_msg->fgs_auth_response, buffer, len);