nasUE is ok

cmake_targets/CMakeLists.txt

@@ -2612,6 +2612,7 @@ endif()
     ${NAS_SRC}UE/nas_parser.c
     ${NAS_SRC}UE/nas_proc.c
     ${NAS_SRC}UE/nas_user.c
+    ${NAS_SRC}NR_UE/nr_nas_itti_messaging.c
     ${NAS_SRC}NR_UE/nr_nas_msg_sim.c
     ${libnas_api_OBJS}
     ${libnas_ue_api_OBJS}
@@ -3106,7 +3107,7 @@ add_executable(nr-uesoftmodem
   ${OPENAIR2_DIR}/LAYER2/NR_MAC_COMMON/nr_mac_common.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
+  ${OPENAIR3_DIR}/NAS/NR_UE/nas_nrue_task.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c

common/utils/ocp_itti/intertask_interface.h

@@ -338,6 +338,7 @@ void * rrc_enb_process_msg(void*);
   TASK_DEF(TASK_RRC_UE,   TASK_PRIORITY_MED,  200, NULL, NULL)  \
   TASK_DEF(TASK_RRC_NRUE, TASK_PRIORITY_MED,  200, NULL, NULL)  \
   TASK_DEF(TASK_NAS_UE,   TASK_PRIORITY_MED,  200, NULL, NULL)  \
+  TASK_DEF(TASK_NAS_NRUE, TASK_PRIORITY_MED,  200, NULL, NULL)  \
   TASK_DEF(TASK_RAL_UE,   TASK_PRIORITY_MED,  200, NULL, NULL)  \
   TASK_DEF(TASK_MSC,      TASK_PRIORITY_MED,  200, NULL, NULL)\
   TASK_DEF(TASK_GTPV1_U,  TASK_PRIORITY_MED,  1000,NULL, NULL)\

executables/nr-uesoftmodem.c

@@ -84,6 +84,7 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include <executables/nr-uesoftmodem.h>
 #include "executables/softmodem-common.h"
 #include "executables/thread-common.h"
+#include "nas_nrue_task.h"
 
 // Raphael : missing
 pthread_cond_t nfapi_sync_cond;
@@ -234,6 +235,10 @@ int create_tasks_nrue(uint32_t ue_nb) {
       LOG_E(NR_RRC, "Create task for RRC UE failed\n");
       return -1;
     }
+    if (itti_create_task (TASK_NAS_NRUE, nas_nrue_task, NULL) < 0) {
+      LOG_E(NR_RRC, "Create task for NAS UE failed\n");
+      return -1;
+    }
   }
 
   itti_wait_ready(0);
@@ -791,14 +796,25 @@ int main( int argc, char **argv ) {
   
   // wait for end of program
   printf("TYPE <CTRL-C> TO TERMINATE\n");
-  protocol_ctxt_t ctxt_pP = {0};
-  ctxt_pP.enb_flag = ENB_FLAG_NO;
-  ctxt_pP.rnti = 0x1234;
-  rrc_ue_generate_RRCSetupRequest(&ctxt_pP, 0);
+  // protocol_ctxt_t ctxt_pP = {0};
+  // ctxt_pP.enb_flag = ENB_FLAG_NO;
+  // ctxt_pP.rnti = 0x1234;
+  // rrc_ue_generate_RRCSetupRequest(&ctxt_pP, 0);
   if (create_tasks_nrue(1) < 0) {
     printf("cannot create ITTI tasks\n");
     exit(-1); // need a softer mode
   }
+  
+  MessageDef  *msg_p;
+  msg_p = itti_alloc_new_message(TASK_RRC_UE, NAS_CELL_SELECTION_CNF);
+  NAS_CELL_SELECTION_CNF (msg_p).errCode = AS_SUCCESS;
+  NAS_CELL_SELECTION_CNF (msg_p).cellID = 0;
+  NAS_CELL_SELECTION_CNF (msg_p).tac = 0;
+  NAS_CELL_SELECTION_CNF (msg_p).rat = 0xFF;
+  NAS_CELL_SELECTION_CNF (msg_p).rsrq = 0;
+  NAS_CELL_SELECTION_CNF (msg_p).rsrp = 0;
+  itti_send_msg_to_task(TASK_NAS_NRUE, 0, msg_p);
+
   while(true)
     sleep(3600);
 

openair2/RRC/NR_UE/rrc_UE.c

@@ -1169,7 +1169,7 @@ int nr_decode_SIB1( const protocol_ctxt_t *const ctxt_pP, const uint8_t gNB_inde
           NAS_CELL_SELECTION_CNF (msg_p).rat = 0xFF;
           NAS_CELL_SELECTION_CNF (msg_p).rsrq = rsrq;
           NAS_CELL_SELECTION_CNF (msg_p).rsrp = rsrp;
-          itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p);
+          itti_send_msg_to_task(TASK_NAS_NRUE, ctxt_pP->instance, msg_p);
           cell_valid = 1;
           NR_UE_rrc_inst[ctxt_pP->module_id].selected_plmn_identity = plmn + 1;
           break;
@@ -2235,7 +2235,7 @@ rrc_ue_process_rrcReconfiguration(
                 NAS_CONN_ESTABLI_CNF(msg_p).errCode = AS_SUCCESS;
                 NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length = pdu_length;
                 NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.data = pdu_buffer;
-                itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p);
+                itti_send_msg_to_task(TASK_NAS_NRUE, ctxt_pP->instance, msg_p);
             }
 
       free (ie->nonCriticalExtension->dedicatedNAS_MessageList);
@@ -2381,7 +2381,7 @@ nr_rrc_ue_decode_dcch(
                     NR_RRCRelease_IEs__deprioritisationReq__deprioritisationType_frequency;
                 }
 
-                 itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p);
+                 itti_send_msg_to_task(TASK_NAS_NRUE, ctxt_pP->instance, msg_p);
                  break;
             case NR_DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry:
             	LOG_I(NR_RRC, "[UE %d] Received Capability Enquiry (gNB %d)\n",
@@ -2406,7 +2406,7 @@ nr_rrc_ue_decode_dcch(
                   uint8_t *pdu_buffer;
                   pdu_length = dedicatedNAS_Message->size;
                   pdu_buffer = dedicatedNAS_Message->buf;
-#if 1 //def ITTI_SIM
+#if 0 //def ITTI_SIM
                   LOG_I(NR_RRC, "[UE %d] Received %s: UEid %u, length %u , buffer %p\n", ctxt_pP->module_id,  messages_info[NAS_DOWNLINK_DATA_IND].name,
                         ctxt_pP->module_id, pdu_length, pdu_buffer);
                   as_nas_info_t initialNasMsg;
@@ -2453,7 +2453,7 @@ nr_rrc_ue_decode_dcch(
                   NAS_DOWNLINK_DATA_IND(msg_p).UEid = ctxt_pP->module_id; // TODO set the UEid to something else ?
                   NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.length = pdu_length;
                   NAS_DOWNLINK_DATA_IND(msg_p).nasMsg.data = pdu_buffer;
-                  itti_send_msg_to_task(TASK_NAS_UE, ctxt_pP->instance, msg_p);
+                  itti_send_msg_to_task(TASK_NAS_NRUE, ctxt_pP->instance, msg_p);
 #endif
               }
             }
@@ -2560,6 +2560,27 @@ void *rrc_nrue_task( void *args_p ) {
           NR_RRC_DCCH_DATA_IND (msg_p).gNB_index);
         break;
 
+      case NAS_CONN_ESTABLI_REQ:
+        LOG_I(RRC, "[UE %d] Received %s: cause %d, type %d, s_tmsi (mme code %"PRIu8", m-tmsi %"PRIu32"), plmnID (%d%d%d.%d%d%d)\n", ue_mod_id, ITTI_MSG_NAME (msg_p), NAS_CONN_ESTABLI_REQ (msg_p).cause,
+              NAS_CONN_ESTABLI_REQ (msg_p).type,
+              NAS_CONN_ESTABLI_REQ (msg_p).s_tmsi.MMEcode,
+              NAS_CONN_ESTABLI_REQ (msg_p).s_tmsi.m_tmsi,
+              NAS_CONN_ESTABLI_REQ (msg_p).plmnID.MCCdigit1,
+              NAS_CONN_ESTABLI_REQ (msg_p).plmnID.MCCdigit2,
+              NAS_CONN_ESTABLI_REQ (msg_p).plmnID.MCCdigit3,
+              NAS_CONN_ESTABLI_REQ (msg_p).plmnID.MNCdigit1,
+              NAS_CONN_ESTABLI_REQ (msg_p).plmnID.MNCdigit2,
+              NAS_CONN_ESTABLI_REQ (msg_p).plmnID.MNCdigit3);
+        PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, ue_mod_id, ENB_FLAG_NO, NOT_A_RNTI, 0, 0, 0);
+        NR_UE_rrc_inst[ue_mod_id].initialNasMsg = NAS_CONN_ESTABLI_REQ (msg_p).initialNasMsg;
+
+        ctxt.enb_flag = ENB_FLAG_NO;
+        ctxt.rnti = 0x1234;
+        rrc_ue_generate_RRCSetupRequest(&ctxt, 0);
+//        rrc_set_sub_state (ue_mod_id, RRC_SUB_STATE_IDLE_CONNECTING);
+
+        break;
+
       case NAS_UPLINK_DATA_REQ: {
         uint32_t length;
         uint8_t *buffer;

openair3/GTPV1-U/gtpv1u_gNB.c

@@ -190,7 +190,7 @@ NwGtpv1uRcT gtpv1u_gNB_process_stack_req(
                    &ctxt,
                    SRB_FLAG_NO,
                    //(gtpv1u_teid_data_p->eps_bearer_id) ? gtpv1u_teid_data_p->eps_bearer_id - 4: 5-4,
-                   1,
+                   4,
                    0, // mui
                    SDU_CONFIRM_NO, // confirm
                    buffer_len,

openair3/NAS/NR_UE/nas_nrue_task.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef NAS_NRUE_TASK_H_
+#define NAS_NRUE_TASK_H_
+
+#include "openairinterface5g_limits.h"
+
+//CUC：add nas_nrue_task.h √
+#include "platform_types.h"
+#include "nr_nas_itti_messaging.h"
+#include "nas_log.h"
+#include "TLVDecoder.h"
+#include "TLVEncoder.h"
+#include "nr_nas_msg_sim.h"
+
+
+void *nas_nrue_task(void *args_p);
+void nr_nas_proc_dl_transfer_ind (Byte_t *data, uint32_t len);
+int decodeNasMsg(MM_msg *msg, uint8_t *buffer, uint32_t len);
+
+int string2ByteArray(char* input,uint8_t* output); //CUC:test
+void tesths(void);
+
+#endif /* NAS_TASK_H_ */

openair3/NAS/NR_UE/nr_nas_itti_messaging.c

+
+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include <string.h>
+
+#include "intertask_interface.h"
+#include "nr_nas_itti_messaging.h"
+#include "msc.h"
+
+int nr_nas_itti_nas_establish_req(as_cause_t cause, as_call_type_t type, as_stmsi_t s_tmsi, plmn_t plmnID, Byte_t *data, uint32_t length, int user_id) {
+  MessageDef *message_p;
+  message_p = itti_alloc_new_message(TASK_NAS_NRUE, NAS_CONN_ESTABLI_REQ);
+  NAS_CONN_ESTABLI_REQ(message_p).cause                       = cause;
+  NAS_CONN_ESTABLI_REQ(message_p).type                        = type;
+  NAS_CONN_ESTABLI_REQ(message_p).s_tmsi                      = s_tmsi;
+  NAS_CONN_ESTABLI_REQ(message_p).plmnID                      = plmnID;
+  NAS_CONN_ESTABLI_REQ(message_p).initialNasMsg.data          = data;
+  NAS_CONN_ESTABLI_REQ(message_p).initialNasMsg.length        = length;
+  MSC_LOG_TX_MESSAGE(
+    MSC_NAS_UE,
+    MSC_RRC_UE,
+    NULL,0,
+    "0 NAS_CONN_ESTABLI_REQ MME code %u m-TMSI %u PLMN %X%X%X.%X%X%X",
+    s_tmsi.MMEcode, s_tmsi.m_tmsi,
+    plmnID.MCCdigit1, plmnID.MCCdigit2, plmnID.MCCdigit3,
+    plmnID.MNCdigit1, plmnID.MNCdigit2, plmnID.MNCdigit3);
+  return itti_send_msg_to_task(TASK_RRC_NRUE, user_id, message_p);
+}
+
+int nr_nas_itti_ul_data_req(const uint32_t ue_id, void *const data, const uint32_t length, int user_id) {
+  MessageDef *message_p;
+  message_p = itti_alloc_new_message(TASK_NAS_NRUE, NAS_UPLINK_DATA_REQ);
+  NAS_UPLINK_DATA_REQ(message_p).UEid          = ue_id;
+  NAS_UPLINK_DATA_REQ(message_p).nasMsg.data   = data;
+  NAS_UPLINK_DATA_REQ(message_p).nasMsg.length = length;
+  return itti_send_msg_to_task(TASK_RRC_NRUE, user_id, message_p);
+}
\ No newline at end of file

openair3/NAS/NR_UE/nr_nas_itti_messaging.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+#ifndef NR_NAS_ITTI_MESSAGING_H_
+#define NR_NAS_ITTI_MESSAGING_H_
+
+#include <string.h>
+#include <stdint.h>
+#include <ctype.h>
+
+#include "assertions.h"
+#include "intertask_interface.h"
+#include "msc.h"
+
+
+int nr_nas_itti_nas_establish_req(as_cause_t cause, as_call_type_t type, as_stmsi_t s_tmsi, plmn_t plmnID, Byte_t *data_pP, uint32_t lengthP, int user_id);
+
+int nr_nas_itti_ul_data_req(const uint32_t ue_idP, void *const data_pP, const uint32_t lengthP, int user_id);
+
+#endif /* NAS_ITTI_MESSAGING_H_ */

openair3/NAS/NR_UE/nr_nas_msg_sim.c

@@ -273,7 +273,7 @@ void generateRegistrationRequest(as_nas_info_t *initialNasMsg) {
   mm_msg->registration_request.fgsregistrationtype = INITIAL_REGISTRATION;
   mm_msg->registration_request.naskeysetidentifier.naskeysetidentifier = 1;
   size += 1;
-  if(1){
+  if(0){
     mm_msg->registration_request.fgsmobileidentity.guti.typeofidentity = FGS_MOBILE_IDENTITY_5G_GUTI;
     mm_msg->registration_request.fgsmobileidentity.guti.amfregionid = 0xca;
     mm_msg->registration_request.fgsmobileidentity.guti.amfpointer = 0;
@@ -441,11 +441,11 @@ void generateAuthenticationResp(as_nas_info_t *initialNasMsg, uint8_t *buf){
   mm_msg->header.message_type = FGS_AUTHENTICATION_RESPONSE;
 
   // set authentication response
-  mm_msg->fgs_identity_response.protocoldiscriminator = FGS_MOBILITY_MANAGEMENT_MESSAGE;
+  mm_msg->fgs_auth_response.protocoldiscriminator = FGS_MOBILITY_MANAGEMENT_MESSAGE;
   size += 1;
-  mm_msg->fgs_identity_response.securityheadertype = PLAIN_5GS_MSG;
+  mm_msg->fgs_auth_response.securityheadertype = PLAIN_5GS_MSG;
   size += 1;
-  mm_msg->fgs_identity_response.messagetype = FGS_AUTHENTICATION_RESPONSE;
+  mm_msg->fgs_auth_response.messagetype = FGS_AUTHENTICATION_RESPONSE;
   size += 1;
 
   //set response parameter