Merge branch 'develop_SA_SIM' into develop_SA_L3

cmake_targets/CMakeLists.txt

@@ -3341,14 +3341,6 @@ add_executable(nr-ittisim
   ${SHLIB_LOADER_SOURCES}
   )
 
-#target_link_libraries (nr-ittisim
-#  -Wl,--start-group
-#  UTIL HASHTABLE SCTP_CLIENT UDP LFDS NR_GTPV1U SECU_CN SECU_OSA
-#  ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} RRC_LIB NR_RRC_LIB 
-#  NGAP_LIB NGAP_GNB S1AP_LIB S1AP_ENB
-#  X2AP_LIB X2AP_ENB F1AP_LIB F1AP M2AP_LIB M2AP_ENB M3AP_LIB M3AP_ENB ${PROTO_AGENT_LIB} ${FSPT_MSG_LIB}
-#  -Wl,--end-group z dl)
-
 target_link_libraries (nr-ittisim
   -Wl,--start-group
   UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB SCHED_RU_LIB SCHED_NR_LIB PHY_NR PHY PHY_COMMON PHY_NR_COMMON PHY_RU LFDS NR_GTPV1U SECU_CN SECU_OSA

openair2/COMMON/itti_sim_messages_types.h

@@ -24,7 +24,7 @@
 
 
 typedef struct itti_sim_rrc_ch_s {
-    const rb_id_t                rbid;
+    rb_id_t                      rbid;
     uint8_t                     *sdu;
     int                          size;
 } itti_sim_rrc_ch_t;

openair2/GNB_APP/gnb_paramdef.h

@@ -246,7 +246,6 @@ typedef struct ccparams_nr_x2 {
 #define GNB_SLICE_SERIVE_TYPE_IDX        0
 #define GNB_SLICE_DIFFERENTIATOR_IDX     1
 
-
 #define GNBSNSSAIPARAMS_DESC {                                                                  \
 /*   optname                               helpstr                 paramflags XXXptr     def val          type    numelt */ \
   {GNB_CONFIG_STRING_SLICE_SERIVE_TYPE,    "slice serive type",            0, uptr:NULL, defuintval:1,    TYPE_UINT, 0},    \
@@ -260,7 +259,6 @@ typedef struct ccparams_nr_x2 {
   { .s5 = { NULL } },             \
 }
 
-
 /* AMF configuration parameters section name */
 #define GNB_CONFIG_STRING_AMF_IP_ADDRESS                "amf_ip_address"
 

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -183,6 +183,7 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
 
   int ss_id;
   uint8_t bwp_id = 1, coreset_id = 1;
+  //NR_ServingCellConfig_t *scd = mac->scg->spCellConfig->spCellConfigDedicated;
   NR_BWP_Downlink_t *bwp = mac->DLbwp[bwp_id - 1];
 
   #ifdef DEBUG_DCI

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -1408,7 +1408,7 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
       (dynamic_prb_BundlingType2==dy_2_n4)||(dynamic_prb_BundlingType2==dy_2_wideband)) prb_BundlingType_size=1;
 
   // 15 RATE_MATCHING_IND FIXME!!!
-  // according to TS 38.212: Rate matching indicator – 0, 1, or 2 bits according to higher layer parameter rateMatchPattern
+  // according to TS 38.212: Rate matching indicator  E0, 1, or 2 bits according to higher layer parameter rateMatchPattern
   uint8_t rateMatching_bits = pdsch_config.n_rateMatchPatterns;
   // 16 ZP_CSI_RS_TRIGGER FIXME!!!
   // 0, 1, or 2 bits as defined in Subclause 5.1.4.2 of [6, TS 38.214].
@@ -1551,7 +1551,7 @@ uint16_t nr_dci_format_size (PHY_VARS_NR_UE *ue,
   // 2 bits otherwise
   uint8_t ptrs_dmrs_bits=0; //FIXME!!!
   // 46 BETA_OFFSET_IND
-  // at IE PUSCH-Config, beta_offset indicator – 0 if the higher layer parameter betaOffsets = semiStatic; otherwise 2 bits
+  // at IE PUSCH-Config, beta_offset indicator  E0 if the higher layer parameter betaOffsets = semiStatic; otherwise 2 bits
   // uci-OnPUSCH
   // Selection between and configuration of dynamic and semi-static beta-offset. If the field is absent or released, the UE applies the value 'semiStatic' and the BetaOffsets
   uint8_t betaOffsets = 0;
@@ -3492,10 +3492,10 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
     	
     case NR_RNTI_P:
       /*
-      // Short Messages Indicator – 2 bits
+      // Short Messages Indicator  E2 bits
       for (int i=0; i<2; i++)
       dci_pdu |= (((uint64_t)dci_pdu_rel15->short_messages_indicator>>(1-i))&1)<<(dci_size-pos++);
-      // Short Messages – 8 bits
+      // Short Messages  E8 bits
       for (int i=0; i<8; i++)
       *dci_pdu |= (((uint64_t)dci_pdu_rel15->short_messages>>(7-i))&1)<<(dci_size-pos++);
       // Freq domain assignment 0-16 bit
@@ -3562,13 +3562,13 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
       // HARQ process number  4bit
       pos+=4;
       dci_pdu_rel15->harq_pid = (*dci_pdu>>(dci_size-pos))&0xf;
-      // Downlink assignment index – 2 bits
+      // Downlink assignment index  E2 bits
       pos+=2;
       dci_pdu_rel15->dai[0].val = (*dci_pdu>>(dci_size-pos))&3;
-      // TPC command for scheduled PUCCH – 2 bits
+      // TPC command for scheduled PUCCH  E2 bits
       pos+=2;
       dci_pdu_rel15->tpc  = (*dci_pdu>>(dci_size-pos))&3;
-      // PDSCH-to-HARQ_feedback timing indicator – 3 bits
+      // PDSCH-to-HARQ_feedback timing indicator  E3 bits
       pos+=3;
       dci_pdu_rel15->pdsch_to_harq_feedback_timing_indicator.val = (*dci_pdu>>(dci_size-pos))&7;
        
@@ -3586,10 +3586,9 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
 	// Time domain assignment 4bit
 	pos+=4;
 	dci_pdu_rel15->time_domain_assignment.val = (*dci_pdu>>(dci_size-pos))&0xf;
-	// This is not supported yet - Skip for now
-  // Frequency hopping flag – 1 bit
-	//pos++;
-	//dci_pdu_rel15->frequency_hopping_flag.val= (*dci_pdu>>(dci_size-pos))&1;
+	// Frequency hopping flag  E1 bit
+	pos++;
+	dci_pdu_rel15->frequency_hopping_flag.val= (*dci_pdu>>(dci_size-pos))&1;
 	// MCS  5 bit
 	pos+=5;
 	dci_pdu_rel15->mcs= (*dci_pdu>>(dci_size-pos))&0x1f;
@@ -3602,10 +3601,10 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
 	// HARQ process number  4bit
 	pos+=4;
 	dci_pdu_rel15->harq_pid = (*dci_pdu>>(dci_size-pos))&0xf;
-	// TPC command for scheduled PUSCH – 2 bits
+	// TPC command for scheduled PUSCH  E2 bits
 	pos+=2;
 	dci_pdu_rel15->tpc = (*dci_pdu>>(dci_size-pos))&3;
-	// UL/SUL indicator – 1 bit
+	// UL/SUL indicator  E1 bit
 	/* commented for now (RK): need to get this from BWP descriptor
 	   if (cfg->pucch_config.pucch_GroupHopping.value)
 	   dci_pdu->= ((uint64_t)*dci_pdu>>(dci_size-pos)ul_sul_indicator&1)<<(dci_size-pos++);
@@ -3623,7 +3622,7 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
 	// Time domain assignment 4bit
 	for (int i=0; i<4; i++)
 	dci_pdu->= (((uint64_t)*dci_pdu>>(dci_size-pos)time_domain_assignment>>(3-i))&1)<<(dci_size-pos++);
-	// Frequency hopping flag – 1 bit
+	// Frequency hopping flag  E1 bit
 	dci_pdu->= ((uint64_t)*dci_pdu>>(dci_size-pos)frequency_hopping_flag&1)<<(dci_size-pos++);
 	// MCS  5 bit
 	for (int i=0; i<5; i++)
@@ -3637,11 +3636,11 @@ int nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
 	for (int i=0; i<4; i++)
 	*dci_pdu  |= (((uint64_t)*dci_pdu>>(dci_size-pos)harq_pid>>(3-i))&1)<<(dci_size-pos++);
 	
-	// TPC command for scheduled PUSCH – 2 bits
+	// TPC command for scheduled PUSCH  E2 bits
 	for (int i=0; i<2; i++)
 	dci_pdu->= (((uint64_t)*dci_pdu>>(dci_size-pos)tpc>>(1-i))&1)<<(dci_size-pos++);
 	*/	
-	// UL/SUL indicator – 1 bit
+	// UL/SUL indicator  E1 bit
 	/*
 	  commented for now (RK): need to get this information from BWP descriptor
 	  if (cfg->pucch_config.pucch_GroupHopping.value)

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -811,7 +811,11 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
           AssertFatal(1==0,"Couldn't fine pucch resource indicator %d in PUCCH resource set %d for %d UCI bits",pucch_resource,i,O_uci);
       }
       else {
+#if (NR_RRC_VERSION >= MAKE_VERSION(16, 0, 0))
         N3 = pucchresset->maxPayloadSize!= NULL ?  *pucchresset->maxPayloadSize : 1706;
+#else
+        N3 = pucchresset->maxPayloadMinus1!= NULL ?  *pucchresset->maxPayloadMinus1 : 1706;
+#endif
         if (N2<O_uci && N3>O_uci) {
           if (pucch_resource < n_list)
             resource_id = pucchresset->resourceList.list.array[pucch_resource];

openair2/RRC/NR/MESSAGES/asn1_msg.h

@@ -99,7 +99,7 @@ uint8_t do_NR_SecurityModeCommand(
                     const uint8_t cipheringAlgorithm,
                     NR_IntegrityProtAlgorithm_t *integrityProtAlgorithm);
 
-uint8_t do_NR_UECapabilityEnquiry_nr( const protocol_ctxt_t *const ctxt_pP,
+uint8_t do_NR_SA_UECapabilityEnquiry( const protocol_ctxt_t *const ctxt_pP,
                                    uint8_t               *const buffer,
                                    const uint8_t                Transaction_id);
 
@@ -117,4 +117,12 @@ uint8_t do_RRCSetupComplete(uint8_t Mod_id,
                             const uint8_t Transaction_id, 
                             uint8_t sel_plmn_id, 
                             const int dedicatedInfoNASLength, 
-                            const char *dedicatedInfoNAS);
+                            const char *dedicatedInfoNAS);
\ No newline at end of file
+
+uint8_t do_RRCSetupRequest(uint8_t Mod_id, uint8_t *buffer,uint8_t *rv);
+
+uint8_t do_NR_RRCReconfigurationComplete(
+                        const protocol_ctxt_t *const ctxt_pP,
+                        uint8_t *buffer,
+                        const uint8_t Transaction_id
+                      );

openair2/RRC/NR/nr_rrc_defs.h

@@ -150,7 +150,7 @@ typedef struct UE_RRC_INFO_NR_s {
   uint32_t                                            SIStatus;
   uint32_t                                            SIcnt;
   uint8_t                                             MCCHStatus[8];             // MAX_MBSFN_AREA
-  uint8_t                                             SIwindowsize;              //!< Corresponds to the SIB1 si-WindowLength parameter. The unit is ms. Possible values are (final): 1,2,5,10,15,20,40
+  uint16_t                                            SIwindowsize;              //!< Corresponds to the SIB1 si-WindowLength parameter. The unit is ms. Possible values are (final): 1,2,5,10,15,20,40
   uint8_t                                             handoverTarget;
   //HO_STATE_t ho_state;
   uint16_t

openair2/RRC/NR_UE/rrc_defs.h

@@ -70,6 +70,13 @@ typedef enum {
   nr_RadioBearerConfigX_r15=1
 } nsa_message_t;
 
+#define MAX_UE_NR_CAPABILITY_SIZE 255
+typedef struct OAI_NR_UECapability_s {
+  uint8_t sdu[MAX_UE_NR_CAPABILITY_SIZE];
+  uint8_t sdu_size;
+  NR_UE_NR_Capability_t *UE_NR_Capability;
+} OAI_NR_UECapability_t;
+
 typedef struct NR_UE_RRC_INST_s {
 
     NR_MeasConfig_t        *meas_config;
@@ -92,6 +99,9 @@ typedef struct NR_UE_RRC_INST_s {
     NR_SRB_INFO_TABLE_ENTRY        Srb2[NB_CNX_UE];
 
     uint8_t                        MBMS_flag;
+	OAI_NR_UECapability_t          *UECap;
+    uint8_t 					   *UECapability;
+    uint8_t                        UECapability_size;
 
     NR_SystemInformation_t         *si[NB_CNX_UE];
     NR_SIB1_t                      *sib1[NB_CNX_UE];
@@ -173,6 +183,7 @@ typedef struct NR_UE_RRC_INST_s {
     long               selected_plmn_identity;
     Rrc_State_NR_t     nrRrcState;
     Rrc_Sub_State_NR_t nrRrcSubState;
+	as_nas_info_t      initialNasMsg;
 } NR_UE_RRC_INST_t;
 
 #endif

openair2/RRC/NR_UE/rrc_proto.h

@@ -118,6 +118,12 @@ int8_t mac_rrc_nr_data_req_ue(const module_id_t Mod_idP,
 /**\brief RRC UE task.
    \param void *args_p Pointer on arguments to start the task. */
 void *rrc_nrue_task(void *args_p);
+
+/**\brief RRC UE generate RRCSetupRequest message.
+   \param ctxt_pP    protocol context 
+   \param gNB_index  gNB index  */
+void rrc_ue_generate_RRCSetupRequest( const protocol_ctxt_t *const ctxt_pP, const uint8_t gNB_index );
+
 /** @}*/
 #endif
 

openair2/SIMULATION/NR_RRC/itti_sim.c

@@ -59,6 +59,7 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "x2ap_eNB.h"
 #include "ngap_gNB.h"
 #include "RRC/NR_UE/rrc_proto.h"
+#include "RRC/NR_UE/rrc_vars.h"
 #include "openair3/NAS/UE/nas_ue_task.h"
 
 pthread_cond_t nfapi_sync_cond;
@@ -380,7 +381,7 @@ int create_tasks_nrue(uint32_t ue_nb) {
   if (ue_nb > 0) {
     printf("create TASK_RRC_NRUE\n");
     if (itti_create_task (TASK_RRC_NRUE, rrc_nrue_task, NULL) < 0) {
-      LOG_E(RRC, "Create task for RRC UE failed\n");
+      LOG_E(NR_RRC, "Create task for RRC UE failed\n");
       return -1;
     }
   }
@@ -406,12 +407,12 @@ void *itti_sim_ue_rrc_task( void *args_p) {
 
     switch (ITTI_MSG_ID(msg_p)) {
       case TERMINATE_MESSAGE:
-        LOG_W(RRC, " *** Exiting RRC thread\n");
+        LOG_W(NR_RRC, " *** Exiting RRC thread\n");
         itti_exit_task ();
         break;
 
       case MESSAGE_TEST:
-        LOG_D(RRC, "[UE %d] Received %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
+        LOG_D(NR_RRC, "[UE %d] Received %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
         break;
       case GNB_RRC_BCCH_DATA_IND:
           message_p = itti_alloc_new_message (TASK_RRC_NRUE, NR_RRC_MAC_BCCH_DATA_IND);
@@ -433,12 +434,11 @@ void *itti_sim_ue_rrc_task( void *args_p) {
         message_p = itti_alloc_new_message (TASK_RRC_NRUE, NR_RRC_DCCH_DATA_IND);
         NR_RRC_DCCH_DATA_IND (message_p).dcch_index = GNB_RRC_DCCH_DATA_IND(msg_p).rbid;
         NR_RRC_DCCH_DATA_IND (message_p).sdu_size   = GNB_RRC_DCCH_DATA_IND(msg_p).size;
-        memset(NR_RRC_DCCH_DATA_IND (message_p).sdu_p, 0, GNB_RRC_DCCH_DATA_IND(msg_p).size);
-        memcpy(NR_RRC_DCCH_DATA_IND (message_p).sdu_p, GNB_RRC_DCCH_DATA_IND(msg_p).sdu, GNB_RRC_DCCH_DATA_IND(msg_p).size);
+        NR_RRC_DCCH_DATA_IND (message_p).sdu_p      = GNB_RRC_DCCH_DATA_IND(msg_p).sdu;
         itti_send_msg_to_task (TASK_RRC_NRUE, instance, message_p);
         break;
       default:
-        LOG_E(RRC, "[UE %d] Received unexpected message %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
+        LOG_E(NR_RRC, "[UE %d] Received unexpected message %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
         break;
     }
 
@@ -464,30 +464,30 @@ void *itti_sim_gnb_rrc_task( void *args_p) {
 
     switch (ITTI_MSG_ID(msg_p)) {
       case TERMINATE_MESSAGE:
-        LOG_W(RRC, " *** Exiting RRC thread\n");
+        LOG_W(NR_RRC, " *** Exiting RRC thread\n");
         itti_exit_task ();
         break;
 
       case MESSAGE_TEST:
-        LOG_D(RRC, "[UE %d] Received %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
+        LOG_D(NR_RRC, "[UE %d] Received %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
         break;
       case UE_RRC_CCCH_DATA_IND:
           message_p = itti_alloc_new_message (TASK_RRC_GNB, NR_RRC_MAC_CCCH_DATA_IND);
-          RRC_MAC_CCCH_DATA_IND (message_p).sdu_size = UE_RRC_CCCH_DATA_IND(msg_p).size;
-          memset (RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
-          memcpy (RRC_MAC_CCCH_DATA_IND (message_p).sdu, UE_RRC_CCCH_DATA_IND(msg_p).sdu, UE_RRC_CCCH_DATA_IND(msg_p).size);
+          NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu_size = UE_RRC_CCCH_DATA_IND(msg_p).size;
+          memset (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, CCCH_SDU_SIZE);
+          memcpy (NR_RRC_MAC_CCCH_DATA_IND (message_p).sdu, UE_RRC_CCCH_DATA_IND(msg_p).sdu, UE_RRC_CCCH_DATA_IND(msg_p).size);
           itti_send_msg_to_task (TASK_RRC_GNB, instance, message_p);
            break;
       case UE_RRC_DCCH_DATA_IND:
     	    message_p = itti_alloc_new_message (TASK_RRC_GNB, NR_RRC_DCCH_DATA_IND);
-    	    RRC_DCCH_DATA_IND (message_p).sdu_size   = UE_RRC_DCCH_DATA_IND(msg_p).size;
-            memset (RRC_MAC_CCCH_DATA_IND (message_p).sdu, 0, UE_RRC_DCCH_DATA_IND(msg_p).size);
-            memcpy (RRC_MAC_CCCH_DATA_IND (message_p).sdu, UE_RRC_DCCH_DATA_IND(msg_p).sdu, UE_RRC_DCCH_DATA_IND(msg_p).size);
+    	    NR_RRC_DCCH_DATA_IND (message_p).sdu_size   = UE_RRC_DCCH_DATA_IND(msg_p).size;
+          NR_RRC_DCCH_DATA_IND (message_p).dcch_index = UE_RRC_DCCH_DATA_IND(msg_p).rbid;
+          NR_RRC_DCCH_DATA_IND (message_p).sdu_p      = UE_RRC_DCCH_DATA_IND(msg_p).sdu;
     	    itti_send_msg_to_task (TASK_RRC_GNB, instance, message_p);
            break;
 
       default:
-        LOG_E(RRC, "[UE %d] Received unexpected message %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
+        LOG_E(NR_RRC, "[UE %d] Received unexpected message %s\n", ue_mod_id, ITTI_MSG_NAME (msg_p));
         break;
     }
 
@@ -522,7 +522,8 @@ int main( int argc, char **argv )
     exit(-1);
   }
 
-  AMF_MODE_ENABLED = !IS_SOFTMODEM_NOS1;
+  // AMF_MODE_ENABLED = !IS_SOFTMODEM_NOS1;
+  AMF_MODE_ENABLED = 0;
 
 #if T_TRACER
   T_Config_Init();
@@ -584,12 +585,7 @@ int main( int argc, char **argv )
   // wait for end of program
   printf("TYPE <CTRL-C> TO TERMINATE\n");
 
-
-
-#if 0
-  // test itti sim
-  usleep(10000);
-
+  usleep(100000);
   protocol_ctxt_t ctxt;
   struct rrc_gNB_ue_context_s *ue_context_p = NULL;
 
@@ -605,11 +601,9 @@ int main( int argc, char **argv )
                                 0,
                                 0,
                                 0);
-  rrc_gNB_generate_RRCSetup(&ctxt,
-                            ue_context_p,
-                            0);
-  // end test itti sim
-#endif
+  NR_UE_rrc_inst[ctxt.module_id].Info[0].State = RRC_SI_RECEIVED;
+
+  rrc_ue_generate_RRCSetupRequest(&ctxt, 0);
 
   printf("Entering ITTI signals handler\n");
   itti_wait_tasks_end();

openair3/NAS/COMMON/EMM/MSG/RegistrationRequest.c

+/*! \file RegistrationRequest.c
+
+\brief registration request procedures for gNB
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+
+#include "nas_log.h"
+
+#include "RegistrationRequest.h"
+
+int decode_registration_request(registration_request_msg *registration_request, uint8_t *buffer, uint32_t len)
+{
+  uint32_t decoded = 0;
+  int decoded_result = 0;
+
+  LOG_FUNC_IN;
+  LOG_TRACE(INFO, "EMM  - registration_request len = %d",
+            len);
+
+  /* Decoding mandatory fields */
+  if ((decoded_result = decode_5gs_registration_type(&registration_request->fgsregistrationtype, 0, *(buffer + decoded)  & 0x0f, len - decoded)) < 0) {
+    //         return decoded_result;
+    LOG_FUNC_RETURN(decoded_result);
+  }
+
+  if ((decoded_result = decode_u8_nas_key_set_identifier(&registration_request->naskeysetidentifier, 0, *(buffer + decoded) >> 4, len - decoded)) < 0) {
+    //         return decoded_result;
+    LOG_FUNC_RETURN(decoded_result);
+  }
+
+  decoded++;
+
+  if ((decoded_result = decode_5gs_mobile_identity(&registration_request->fgsmobileidentity, 0, buffer + decoded, len - decoded)) < 0) {
+    //         return decoded_result;
+    LOG_FUNC_RETURN(decoded_result);
+  } else
+    decoded += decoded_result;
+
+
+  // TODO, Decoding optional fields
+
+  return decoded;
+}
+
+int encode_registration_request(registration_request_msg *registration_request, uint8_t *buffer, uint32_t len)
+{
+  int encoded = 0;
+  int encode_result = 0;
+
+  *(buffer + encoded) = ((encode_u8_nas_key_set_identifier(&registration_request->naskeysetidentifier) & 0x0f) << 4) | (encode_5gs_registration_type(&registration_request->fgsregistrationtype) & 0x0f);
+  encoded++;
+
+  if ((encode_result =
+         encode_5gs_mobile_identity(&registration_request->fgsmobileidentity, 0, buffer +
+                                    encoded, len - encoded)) < 0)        //Return in case of error
+    return encode_result;
+  else
+    encoded += encode_result;
+
+  // TODO, Eecoding optional fields
+  return encoded;
+}
+

openair3/NAS/COMMON/EMM/MSG/RegistrationRequest.h

+/*! \file RegistrationRequest.h
+
+\brief registration request procedures for gNB
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "ExtendedProtocolDiscriminator.h"
+#include "SecurityHeaderType.h"
+#include "SpareHalfOctet.h"
+#include "FGSMobileIdentity.h"
+#include "NasKeySetIdentifier.h"
+#include "FGSRegistrationType.h"
+#include "MessageType.h"
+
+#ifndef REGISTRATION_REQUEST_H_
+#define REGISTRATION_REQUEST_H_
+
+
+# define REGISTRATION_REQUEST_NON_CURRENT_NATIVE_NAS_KEYSET_PRESENT           (1<<0)
+# define REGISTRATION_REQUEST_5GMM_CAPABILITY_PRESENT                         (1<<1)
+# define REGISTRATION_REQUEST_UE_SECURITY_CAPABILITY_PRESENT                  (1<<2)
+# define REGISTRATION_REQUEST_REQUESTED_NSSAI_PRESENT                         (1<<3)
+# define REGISTRATION_REQUEST_LAST_VISITED_REGISTERED_TAI_PRESENT             (1<<4)
+# define REGISTRATION_REQUEST_S1_UE_NETWORK_CAPABILITY_PRESENT                (1<<5)
+# define REGISTRATION_REQUEST_UPLINK_DATA_STATUS_PRESENT                      (1<<6)
+# define REGISTRATION_REQUEST_PDU_SESSION_STATUS_PRESENT                      (1<<7)
+# define REGISTRATION_REQUEST_MICO_INDICATION_PRESENT                         (1<<8)
+# define REGISTRATION_REQUEST_UE_STATUS_PRESENT                               (1<<9)
+# define REGISTRATION_REQUEST_ADDITIONAL_GUTI_PRESENT                         (1<<10)
+# define REGISTRATION_REQUEST_ALLOWED_PDU_SESSION_STATUS_PRESENT              (1<<11)
+# define REGISTRATION_REQUEST_UE_USAGE_SETTING_PRESENT                        (1<<12)
+# define REGISTRATION_REQUEST_REQUESTED_DRX_PARAMETERS_PRESENT                (1<<13)
+# define REGISTRATION_REQUEST_EPS_NAS_MESSAGE_CONTAINER_PRESENT               (1<<14)
+# define REGISTRATION_REQUEST_LADN_INDICATION_PRESENT                         (1<<15)
+# define REGISTRATION_REQUEST_PAYLOAD_CONTAINER_TYPE_PRESENT                  (1<<16)
+# define REGISTRATION_REQUEST_PAYLOAD_CONTAINER_PRESENT                       (1<<17)
+# define REGISTRATION_REQUEST_NETWORK_SLICING_INDICATION_PRESENT              (1<<18)
+# define REGISTRATION_REQUEST_5GS_UPDATE_TYPE_PRESENT                         (1<<19)
+# define REGISTRATION_REQUEST_NAS_MESSAGE_CONTAINER_PRESENT                   (1<<20)
+# define REGISTRATION_REQUEST_EPS_BEARER_CONTEXT_STATUS_PRESENT               (1<<21)
+
+typedef enum registration_request_iei_tag {
+  REGISTRATION_REQUEST_NON_CURRENT_NATIVE_NAS_KEYSET_IEI                          = 0xC0, /* 0xC- = 192- */
+  REGISTRATION_REQUEST_5GMM_CAPABILITY_IEI                                        = 0x10, /* 0x10 = 16  */
+  REGISTRATION_REQUEST_UE_SECURITY_CAPABILITY_IEI                                 = 0x2E, /* 0x2E = 46  */
+  REGISTRATION_REQUEST_REQUESTED_NSSAI_IEI                                        = 0x2F, /* 0x2F = 47  */
+  REGISTRATION_REQUEST_LAST_VISITED_REGISTERED_TAI_IEI                            = 0x52, /* 0x52 = 82  */
+  REGISTRATION_REQUEST_S1_UE_NETWORK_CAPABILITY_IEI                               = 0x17, /* 0x17 = 23  */
+  REGISTRATION_REQUEST_UPLINK_DATA_STATUS_IEI                                     = 0x40, /* 0x40 = 64  */
+  REGISTRATION_REQUEST_PDU_SESSION_STATUS_IEI                                     = 0x50, /* 0x50 = 80  */
+  REGISTRATION_REQUEST_MICO_INDICATION_IEI                                        = 0xB0, /* 0xB- = 176- */
+  REGISTRATION_REQUEST_UE_STATUS_IEI                                              = 0x2B, /* 0x2B = 43  */
+  REGISTRATION_REQUEST_ADDITIONAL_GUTI_IEI                                        = 0x77, /* 0x77 = 119  */
+  REGISTRATION_REQUEST_ALLOWED_PDU_SESSION_STATUS_IEI                             = 0x25, /* 0x25 = 37  */
+  REGISTRATION_REQUEST_UE_USAGE_SETTING_IEI                                       = 0x18, /* 0x18 = 24  */
+  REGISTRATION_REQUEST_REQUESTED_DRX_PARAMETERS_IEI                               = 0x51, /* 0x51 = 81  */
+  REGISTRATION_REQUEST_EPS_NAS_MESSAGE_CONTAINER_IEI                              = 0x70, /* 0x70 = 112  */
+  REGISTRATION_REQUEST_LADN_INDICATION_IEI                                        = 0x74, /* 0x74 = 116  */
+  REGISTRATION_REQUEST_PAYLOAD_CONTAINER_TYPE_IEI                                 = 0x80, /* 0x80 = 128  */
+  REGISTRATION_REQUEST_PAYLOAD_CONTAINER_IEI                                      = 0x7B, /* 0x7B = 123  */
+  REGISTRATION_REQUEST_NETWORK_SLICING_INDICATION_IEI                             = 0x90, /* 0x90 = 144  */
+  REGISTRATION_REQUEST_5GS_UPDATE_TYPE_IEI                                        = 0x53, /* 0x53 = 83  */
+  REGISTRATION_REQUEST_NAS_MESSAGE_CONTAINER_IEI                                  = 0x71, /* 0x71 = 113  */
+  REGISTRATION_REQUEST_EPS_BEARER_CONTEXT_STATUS_IEI                              = 0x60  /* 0x60 = 96  */
+} registration_request_iei;
+
+/*
+ * Message name: Registration request
+ * Description: This message is sent by the UE to the AMF. See TS24.501 table 8.2.6.1.1.
+ * Significance: dual
+ * Direction: UE to network
+ */
+
+typedef struct registration_request_msg_tag {
+  /* Mandatory fields */
+  ExtendedProtocolDiscriminator           protocoldiscriminator;
+  SecurityHeaderType                      securityheadertype:4;
+  SpareHalfOctet                          sparehalfoctet:4;
+  MessageType                             messagetype;
+  FGSRegistrationType                     fgsregistrationtype;
+  NasKeySetIdentifier                     naskeysetidentifier;
+  FGSMobileIdentity                       fgsmobileidentity;
+
+  /* Optional fields */
+} registration_request_msg;
+
+int decode_registration_request(registration_request_msg *registrationrequest, uint8_t *buffer, uint32_t len);
+
+int encode_registration_request(registration_request_msg *registrationrequest, uint8_t *buffer, uint32_t len);
+
+#endif /* ! defined(REGISTRATION_REQUEST_H_) */
+

openair3/NAS/COMMON/IES/ExtendedProtocolDiscriminator.c

+/*! \file ExtendedProtocolDiscriminator.c
+
+\brief Extended protocol discriminator for registration request procedures
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+
+#include "TLVEncoder.h"
+#include "TLVDecoder.h"
+#include "ExtendedProtocolDiscriminator.h"
+
+int encode_ex_protocol_discriminator(ExtendedProtocolDiscriminator *exprotocoldiscriminator, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  return 0;
+}
+
+int decode_ex_protocol_discriminator(ExtendedProtocolDiscriminator *exprotocoldiscriminator, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  return 0;
+}
+

openair3/NAS/COMMON/IES/ExtendedProtocolDiscriminator.h

+/*! \file ExtendedProtocolDiscriminator.h
+
+\brief Extended protocol discriminator for registration request procedures
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "OctetString.h"
+
+#ifndef EXTENDED_PROTOCOL_DISCRIMINATOR_H_
+#define EXTENDED_PROTOCOL_DISCRIMINATOR_H_
+
+typedef uint8_t ExtendedProtocolDiscriminator;
+
+int encode_ex_protocol_discriminator(ExtendedProtocolDiscriminator *exprotocoldiscriminator, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+int decode_ex_protocol_discriminator(ExtendedProtocolDiscriminator *exprotocoldiscriminator, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+#endif /* EXTENDED PROTOCOL DISCRIMINATOR_H_ */
+

openair3/NAS/COMMON/IES/FGSMobileIdentity.c

+/*! \file FGSMobileIdentity.c
+
+\brief 5GS Mobile Identity for registration request procedures
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+
+#include "TLVEncoder.h"
+#include "TLVDecoder.h"
+#include "FGSMobileIdentity.h"
+
+static int decode_guti_5gs_mobile_identity(Guti5GSMobileIdentity_t *guti, uint8_t *buffer);
+
+static int encode_guti_5gs_mobile_identity(Guti5GSMobileIdentity_t *guti, uint8_t *buffer);
+
+int decode_5gs_mobile_identity(FGSMobileIdentity *fgsmobileidentity, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  int decoded_rc = TLV_DECODE_VALUE_DOESNT_MATCH;
+  int decoded = 0;
+  uint8_t ielen = 0;
+
+  if (iei > 0) {
+    CHECK_IEI_DECODER(iei, *buffer);
+    decoded++;
+  }
+
+  ielen = *(buffer + decoded);
+  decoded++;
+  CHECK_LENGTH_DECODER(len - decoded, ielen);
+
+  uint8_t typeofidentity = *(buffer + decoded) & 0x7;
+
+  if (typeofidentity == FGS_MOBILE_IDENTITY_5G_GUTI) {
+    decoded_rc = decode_guti_5gs_mobile_identity(&fgsmobileidentity->guti,
+                 buffer + decoded);
+  }
+
+  if (decoded_rc < 0) {
+    return decoded_rc;
+  }
+
+  return (decoded + decoded_rc);
+}
+
+int encode_5gs_mobile_identity(FGSMobileIdentity *fgsmobileidentity, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  uint8_t *lenPtr;
+  int encoded_rc = TLV_ENCODE_VALUE_DOESNT_MATCH;
+  uint32_t encoded = 0;
+
+  if (iei > 0) {
+    *buffer = iei;
+    encoded++;
+  }
+
+  lenPtr  = (buffer + encoded);
+  encoded ++;
+
+  if (fgsmobileidentity->guti.typeofidentity == FGS_MOBILE_IDENTITY_5G_GUTI) {
+    encoded_rc = encode_guti_5gs_mobile_identity(&fgsmobileidentity->guti,
+                 buffer + encoded);
+  }
+
+  if (encoded_rc < 0) {
+    return encoded_rc;
+  }
+
+  *lenPtr = encoded  + encoded_rc - 1 - ((iei > 0) ? 1 : 0);
+  return (encoded + encoded_rc);
+}
+
+static int decode_guti_5gs_mobile_identity(Guti5GSMobileIdentity_t *guti, uint8_t *buffer)
+{
+  int decoded = 0;
+  uint16_t temp;
+  guti->spare = (*(buffer + decoded) >> 4) & 0xf;
+
+  /*
+   * For the 5G-GUTI, bits 5 to 8 of octet 3 are coded as "1111"
+   */
+  if (guti->spare != 0xf) {
+    return (TLV_ENCODE_VALUE_DOESNT_MATCH);
+  }
+
+
+  guti->oddeven = (*(buffer + decoded) >> 3) & 0x1;
+
+  /*
+   * For the 5G-GUTI, bits 4 of octet 3 are coded as "0"
+   */
+  if (guti->oddeven != 0) {
+    return (TLV_ENCODE_VALUE_DOESNT_MATCH);
+  }
+  guti->typeofidentity = *(buffer + decoded) & 0x7;
+
+  if (guti->typeofidentity != FGS_MOBILE_IDENTITY_5G_GUTI) {
+    return (TLV_ENCODE_VALUE_DOESNT_MATCH);
+  }
+
+  decoded++;
+  guti->mccdigit2 = (*(buffer + decoded) >> 4) & 0xf;
+  guti->mccdigit1 = *(buffer + decoded) & 0xf;
+  decoded++;
+  guti->mncdigit3 = (*(buffer + decoded) >> 4) & 0xf;
+  guti->mccdigit3 = *(buffer + decoded) & 0xf;
+  decoded++;
+  guti->mncdigit2 = (*(buffer + decoded) >> 4) & 0xf;
+  guti->mncdigit1 = *(buffer + decoded) & 0xf;
+  decoded++;
+
+
+  guti->amfregionid = *(buffer+decoded);
+  decoded++;
+  IES_DECODE_U16(buffer, decoded, temp);
+  guti->amfsetid = temp>>3;
+  guti->amfpointer = temp&0x3f;
+
+  IES_DECODE_U32(buffer, decoded, guti->tmsi);
+  return decoded;
+}
+
+
+static int encode_guti_5gs_mobile_identity(Guti5GSMobileIdentity_t *guti, uint8_t *buffer)
+{
+  uint32_t encoded = 0;
+  uint16_t temp;
+  *(buffer + encoded) = 0xf0 | ((guti->oddeven & 0x1) << 3) |
+                        (guti->typeofidentity & 0x7);
+  encoded++;
+  *(buffer + encoded) = 0x00 | ((guti->mccdigit2 & 0xf) << 4) |
+                        (guti->mccdigit1 & 0xf);
+  encoded++;
+  *(buffer + encoded) = 0x00 | ((guti->mncdigit3 & 0xf) << 4) |
+                        (guti->mccdigit3 & 0xf);
+  encoded++;
+  *(buffer + encoded) = 0x00 | ((guti->mncdigit2 & 0xf) << 4) |
+                        (guti->mncdigit1 & 0xf);
+  encoded++;
+
+  *(buffer + encoded) = guti->amfregionid;
+  encoded++;
+
+  temp = 0x00 | ((guti->amfsetid & 0x3f) << 6) | (guti->amfpointer & 0x3f);
+
+  IES_ENCODE_U16(buffer, encoded, temp);
+  IES_ENCODE_U32(buffer, encoded, guti->tmsi);
+  return encoded;
+}
+

openair3/NAS/COMMON/IES/FGSMobileIdentity.h

+/*! \file FGSMobileIdentity.h
+
+\brief 5GS Mobile Identity for registration request procedures
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "OctetString.h"
+
+#ifndef FGS_MOBILE_IDENTITY_H_
+#define FGS_MOBILE_IDENTITY_H_
+
+
+typedef struct {
+  uint8_t  spare:5;
+  uint8_t  typeofidentity:3;
+} NoIdentity5GSMobileIdentity_t;
+
+typedef struct {
+  uint8_t  spare1:1;
+  uint8_t  supiformat:3;
+  uint8_t  spare2:1;
+  uint8_t  typeofidentity:3;
+  uint8_t  mccdigit2:4;
+  uint8_t  mccdigit1:4;
+  uint8_t  mncdigit3:4;
+  uint8_t  mccdigit3:4;
+  uint8_t  mncdigit2:4;
+  uint8_t  mncdigit1:4;
+  uint8_t  routingindicatordigit2:4;
+  uint8_t  routingindicatordigit1:4;
+  uint8_t  routingindicatordigit4:4;
+  uint8_t  routingindicatordigit3:4;
+  uint8_t  spare3:1;
+  uint8_t  spare4:1;
+  uint8_t  spare5:1;
+  uint8_t  spare6:1;
+  uint8_t  protectionschemeId:4;
+  uint8_t  homenetworkpki;
+} Suci5GSMobileIdentity_t;
+
+typedef struct {
+  uint8_t  spare:4;
+  uint8_t  oddeven:1;
+  uint8_t  typeofidentity:3;
+  uint8_t  mccdigit2:4;
+  uint8_t  mccdigit1:4;
+  uint8_t  mncdigit3:4;
+  uint8_t  mccdigit3:4;
+  uint8_t  mncdigit2:4;
+  uint8_t  mncdigit1:4;
+  uint8_t  amfregionid;
+  uint16_t amfsetid:10;
+  uint16_t amfpointer:6;
+  uint32_t tmsi;
+} Guti5GSMobileIdentity_t;
+
+
+typedef struct {
+  uint8_t  digit1:4;
+  uint8_t  oddeven:1;
+  uint8_t  typeofidentity:3;
+  uint8_t  digitp1:4;
+  uint8_t  digitp:4;
+} Imei5GSMobileIdentity_t;
+
+typedef Imei5GSMobileIdentity_t Imeisv5GSMobileIdentity_t;
+
+
+typedef struct {
+  uint8_t  digit1:4;
+  uint8_t  spare:1;
+  uint8_t  typeofidentity:3;
+  uint16_t amfsetid:10;
+  uint16_t amfpointer:6;
+  uint32_t tmsi;
+} Stmsi5GSMobileIdentity_t;
+
+typedef struct {
+  uint8_t  spare:5;
+  uint8_t  typeofidentity:3;
+  uint8_t  macaddr;
+} Macaddr5GSMobileIdentity_t;
+
+typedef union FGSMobileIdentity_tag {
+#define FGS_MOBILE_IDENTITY_NOIDENTITY    0b000
+#define FGS_MOBILE_IDENTITY_SUCI          0b001
+#define FGS_MOBILE_IDENTITY_5G_GUTI       0b010
+#define FGS_MOBILE_IDENTITY_IMEI          0b011
+#define FGS_MOBILE_IDENTITY_5GS_TMSI      0b100
+#define FGS_MOBILE_IDENTITY_IMEISV        0b101
+#define FGS_MOBILE_IDENTITY_MAC_ADDR      0b110
+  NoIdentity5GSMobileIdentity_t   noidentity;
+  Suci5GSMobileIdentity_t         suci;
+  Guti5GSMobileIdentity_t         guti;
+  Imei5GSMobileIdentity_t         imei;
+  Stmsi5GSMobileIdentity_t        stmsi;
+  Imeisv5GSMobileIdentity_t       imeisv;
+  Macaddr5GSMobileIdentity_t      macaddress;
+} FGSMobileIdentity;
+
+int encode_5gs_mobile_identity(FGSMobileIdentity *fgsmobileidentity, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+int decode_5gs_mobile_identity(FGSMobileIdentity *fgsmobileidentity, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+#endif /* FGS MOBILE IDENTITY_H_ */
+

openair3/NAS/COMMON/IES/FGSRegistrationType.c

+/*! \file FGSRegistrationType.c
+
+\brief 5GS Registration Type for registration request procedures
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+
+#include "TLVEncoder.h"
+#include "TLVDecoder.h"
+#include "FGSRegistrationType.h"
+
+int decode_5gs_registration_type(FGSRegistrationType *fgsregistrationtype, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  int decoded = 0;
+  if (iei > 0) {
+    CHECK_IEI_DECODER((*buffer & 0xf0), iei);
+  }
+
+  *fgsregistrationtype = *buffer & 0x7;
+  decoded++;
+
+  return decoded;
+}
+
+int encode_5gs_registration_type(FGSRegistrationType *fgsregistrationtype)
+{
+  uint8_t bufferReturn;
+  uint8_t *buffer = &bufferReturn;
+  uint8_t encoded = 0;
+  uint8_t iei = 0;
+  *(buffer + encoded) = 0x00 | (iei & 0xf0) |
+                        (*fgsregistrationtype & 0x7);
+  encoded++;
+
+  return bufferReturn;
+}
+

openair3/NAS/COMMON/IES/FGSRegistrationType.h

+/*! \file FGSRegistrationType.h
+
+\brief 5GS Registration Type for registration request procedures
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "OctetString.h"
+
+#ifndef FGS_REGISTRATION_TYPE_H_
+#define FGS_REGISTRATION_TYPE_H_
+
+#define FGS_REGISTRATION_TYPE_MINIMUM_LENGTH 1
+#define FGS_REGISTRATION_TYPE_MAXIMUM_LENGTH 1
+
+typedef uint8_t FGSRegistrationType;
+
+
+#define INITIAL_REGISTRATION               0b001
+#define MOBILITY_REGISTRATION_UPDATING     0b010
+#define PERIODIC_REGISTRATION_UPDATING     0b011
+#define EMERGENCY_REGISTRATION             0b100
+
+int encode_5gs_registration_type(FGSRegistrationType *fgsregistrationtype);
+
+int decode_5gs_registration_type(FGSRegistrationType *fgsregistrationtype, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+
+#endif /* FGS_REGISTRATION_TYPE_H_*/
+

openair3/NAS/COMMON/IES/SpareHalfOctet.c

+/*! \file SpareHalfOctet.c
+
+\brief registration request procedures for gNB
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+
+#include "TLVEncoder.h"
+#include "TLVDecoder.h"
+#include "SpareHalfOctet.h"
+
+int decode_spare_half_octet(SpareHalfOctet *sparehalfoctet, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  return 0;
+}
+
+int encode_spare_half_octet(SpareHalfOctet *sparehalfoctet, uint8_t iei, uint8_t *buffer, uint32_t len)
+{
+  return 0;
+}
+

openair3/NAS/COMMON/IES/SpareHalfOctet.h

+/*! \file SpareHalfOctet.h
+
+\brief registration request procedures for gNB
+\author Yoshio INOUE, Masayuki HARADA
+\email: yoshio.inoue@fujitsu.com,masayuki.harada@fujitsu.com
+\date 2020
+\version 0.1
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+
+#include "OctetString.h"
+
+#ifndef SPARE_HALF_OCTET_H_
+#define SPARE_HALF_OCTET_H_
+
+#define SPARE_HALF_OCTET_MINIMUM_LENGTH 1
+#define SPARE_HALF_OCTET_MAXIMUM_LENGTH 1
+
+typedef uint8_t SpareHalfOctet;
+
+int encode_spare_half_octet(SpareHalfOctet *sparehalfoctet, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+int decode_spare_half_octet(SpareHalfOctet *sparehalfoctet, uint8_t iei, uint8_t *buffer, uint32_t len);
+
+#endif /* SPARE HALF OCTET_H_ */
+

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -70,6 +70,7 @@ int ngap_gNB_handle_nas_first_req(
     DevAssert(instance_p != NULL);
     memset(&pdu, 0, sizeof(pdu));
     pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
+    pdu.choice.initiatingMessage = (NGAP_InitiatingMessage_t *)calloc(1,sizeof(NGAP_InitiatingMessage_t));
     pdu.choice.initiatingMessage->procedureCode = NGAP_ProcedureCode_id_InitialUEMessage;
     pdu.choice.initiatingMessage->criticality = NGAP_Criticality_ignore;
     pdu.choice.initiatingMessage->value.present = NGAP_InitiatingMessage__value_PR_InitialUEMessage;
@@ -224,6 +225,8 @@ int ngap_gNB_handle_nas_first_req(
 
     ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
 
+    ie->value.choice.UserLocationInformation.choice.userLocationInformationNR = 
+        CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
     userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;
 
     /* Set nRCellIdentity. default userLocationInformationNR */