From fbc743d2b84eec70bdb2e3ccbf0f7e37d701d301 Mon Sep 17 00:00:00 2001
From: cucengineer <2702919197@qq.com>
Date: Sun, 22 Nov 2020 21:38:02 +0800
Subject: [PATCH] Update nas_nrue_task.c

---
 openair3/NAS/NR_UE/nas_nrue_task.c | 38 ++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/openair3/NAS/NR_UE/nas_nrue_task.c b/openair3/NAS/NR_UE/nas_nrue_task.c
index 2c309b85fa..8a1070563e 100644
--- a/openair3/NAS/NR_UE/nas_nrue_task.c
+++ b/openair3/NAS/NR_UE/nas_nrue_task.c
@@ -276,6 +276,7 @@ static int _nas_mm_msg_decode_header(mm_msg_header_t *header,
   return (size);
 }
 
+<<<<<<< HEAD
 // static int _emm_msg_encode_header(const emm_msg_header_t *header,
 //                                   uint8_t *buffer, uint32_t len) {
 //   int size = 0;
@@ -290,3 +291,40 @@ static int _nas_mm_msg_decode_header(mm_msg_header_t *header,
 //   ENCODE_U8(buffer + size, header->message_type, size);
 //   return (size);
 // }
+=======
+int encode_IdentityresponseIMSI(IdentityresponseIMSI_t *identity_response, uint8_t *buffer, uint32_t len)
+{
+  int encoded = 0;
+  int encode_result = 0;
+
+  /* Checking IEI and pointer */
+  CHECK_PDU_POINTER_AND_LENGTH_ENCODER(buffer, IDENTITY_RESPONSE_MINIMUM_LENGTH, len);
+
+  if ((encode_result =
+         encode_mobile_identity(&identity_response->mobileidentity, 0, buffer +
+                                encoded, len - encoded)) < 0)        //Return in case of error
+    return encode_result;
+  else
+    encoded += encode_result;
+
+  return encoded;
+}
+
+int encode_authenticationresponse(authenticationresponse_t *authentication_response, uint8_t *buffer, uint32_t len)
+{
+  int encoded = 0;
+  int encode_result = 0;
+
+  /* Checking IEI and pointer */
+  CHECK_PDU_POINTER_AND_LENGTH_ENCODER(buffer, AUTHENTICATION_RESPONSE_MINIMUM_LENGTH, len);
+
+  if ((encode_result =
+         encode_authentication_response_parameter(&authentication_response->authenticationresponseparameter,
+             0, buffer + encoded, len - encoded)) < 0)        //Return in case of error
+    return encode_result;
+  else
+    encoded += encode_result;
+
+  return encoded;
+}
+>>>>>>> parent of d659e98df... Update nas_nrue_task.c
-- 
2.26.2