continue code and take review comments

common/utils/telnetsrv/CMakeLists.txt

@@ -35,7 +35,7 @@ add_library(telnetsrv MODULE
             telnetsrv_measurements.c
 )
 target_link_libraries(telnetsrv PRIVATE history)
-target_link_libraries(telnetsrv PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(telnetsrv PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 
 message(STATUS "Add enb specific telnet functions in libtelnetsrv_enb.so")
 add_library(telnetsrv_enb MODULE
@@ -43,7 +43,7 @@ add_library(telnetsrv_enb MODULE
             telnetsrv_enb_phycmd.c
 )
 add_dependencies(telnetsrv telnetsrv_enb)
-target_link_libraries(telnetsrv_enb PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(telnetsrv_enb PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap )
 
 message(STATUS "No specific telnet functions for gnb")
 
@@ -52,7 +52,7 @@ message(STATUS "No specific telnet functions for 4Gue")
 message(STATUS "Add 5Gue specific telnet functions in libtelnetsrv_5Gue.so")
 add_library(telnetsrv_5Gue MODULE telnetsrv_5Gue_measurements.c)
 add_dependencies(telnetsrv telnetsrv_5Gue)
-target_link_libraries(telnetsrv_5Gue PRIVATE asn1_nr_rrc asn1_lte_rrc)
+target_link_libraries(telnetsrv_5Gue PRIVATE asn1_nr_rrc asn1_lte_rrc asn1_ngap)
 
 # all libraries should be written to root build dir
 set_target_properties(telnetsrv telnetsrv_enb telnetsrv_5Gue

openair2/COMMON/ngap_messages_types.h

@@ -300,7 +300,7 @@ typedef enum pdusession_qosflow_mapping_ind_e{
 typedef struct pdusession_associate_qosflow_s{
   uint8_t                           qfi;
   pdusession_qosflow_mapping_ind_t  qos_flow_mapping_ind;
-}pdusession_associate_qosflow_t;
+} pdusession_associate_qosflow_t;
 
 typedef struct pdusession_setup_s {
   /* Unique pdusession_id for the UE. */
@@ -319,22 +319,6 @@ typedef struct pdusession_setup_s {
   pdusession_associate_qosflow_t associated_qos_flows[QOSFLOW_MAX_VALUE];
 } pdusession_setup_t;
 
-typedef struct pdusession_admitted_tobe_added_s {
-  /* Unique pdusession_id for the UE. */
-  uint8_t pdusession_id;
-
-  /* Unique drb_ID for the UE. */
-  uint8_t drb_ID;
-
-  /* The transport layer address for the IP packets */
-  ngap_transport_layer_addr_t gnb_addr;
-
-  /* S-GW Tunnel endpoint identifier */
-  uint32_t gtp_teid;
-} pdusession_admitted_tobe_added_t;
-
-
-
 typedef struct pdusession_tobeswitched_s {
   /* Unique pdusession_id for the UE. */
   uint8_t pdusession_id;
@@ -610,7 +594,7 @@ typedef struct ngap_initial_context_setup_req_s {
   /* UE id for initial connection to NGAP */
   uint32_t gNB_ue_ngap_id;
 
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* UE aggregate maximum bitrate */
   ngap_ambr_t ue_ambr;
@@ -665,14 +649,22 @@ typedef struct ngap_paging_ind_s {
   ngap_paging_priority_t paging_priority;
 } ngap_paging_ind_t;
 
+typedef struct {
+  /* Unique pdusession_id for the UE. */
+  int pdusession_id;
+  ngap_pdu_t nas_pdu;
+  ngap_pdu_t pdusessionTransfer;
+} pdusession_setup_req_t;
+
 typedef struct ngap_pdusession_setup_req_s {
   /* UE id for initial connection to NGAP */
   uint32_t gNB_ue_ngap_id;
 
   /* AMF UE id  */
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* S-NSSAI */
+  // Fixme: illogical, nssai is part of each pdu session
   ngap_allowed_NSSAI_t allowed_nssai[8];
 
   /* Number of pdusession to be setup in the list */
@@ -712,7 +704,7 @@ typedef struct ngap_path_switch_req_s {
   pdusession_setup_t pdusessions_tobeswitched[NGAP_MAX_PDUSESSION];
 
   /* AMF UE id  */
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   ngap_guami_t ue_guami;
 
@@ -730,7 +722,7 @@ typedef struct ngap_path_switch_req_ack_s {
   uint32_t  gNB_ue_ngap_id;
 
   /* AMF UE id  */
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* UE aggregate maximum bitrate */
   ngap_ambr_t ue_ambr;
@@ -758,7 +750,7 @@ typedef struct ngap_pdusession_modification_ind_s {
   uint32_t  gNB_ue_ngap_id;
 
   /* AMF UE id  */
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* Number of pdusession setup-ed in the list */
   uint8_t       nb_of_pdusessions_tobemodified;
@@ -802,7 +794,7 @@ typedef struct ngap_ue_release_req_s {
 
 typedef struct ngap_pdusession_modify_req_s {
   /* AMF UE id  */
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* gNB ue ngap id as initialized by NGAP layer */
   uint32_t  gNB_ue_ngap_id;
@@ -830,7 +822,7 @@ typedef struct ngap_pdusession_modify_resp_s {
 
 typedef struct ngap_pdusession_release_command_s {
   /* AMF UE id  */
-  uint64_t                       amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* gNB ue ngap id as initialized by NGAP layer */
   uint32_t                       gNB_ue_ngap_id;
@@ -848,7 +840,7 @@ typedef struct ngap_pdusession_release_command_s {
 
 typedef struct ngap_pdusession_release_resp_s {
   /* AMF UE id  */
-  uint64_t             amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* gNB ue ngap id as initialized by NGAP layer */
   uint32_t             gNB_ue_ngap_id;

openair2/COMMON/platform_types.h

@@ -230,8 +230,7 @@ typedef struct protocol_ctxt_s {
 #define ENB_INSTANCE_TO_MODULE_ID( iNSTANCE )iNSTANCE
 
 //NR
-#define GNB_MODULE_ID_TO_INSTANCE( mODULE_iD ) mODULE_iD
-#define GNB_INSTANCE_TO_MODULE_ID( iNSTANCE )iNSTANCE
+#define GNB_MODULE_ID_TO_INSTANCE(mODULE_iD) mODULE_iD
 
 #define MODULE_ID_TO_INSTANCE(mODULE_iD, iNSTANCE, eNB_fLAG) \
   do { \

openair2/F1AP/f1ap_cu_task.c

@@ -57,7 +57,7 @@ static void cu_task_handle_sctp_association_ind(instance_t instance, sctp_new_as
   f1ap_cu_data->sctp_in_streams  = sctp_new_association_ind->in_streams;
   f1ap_cu_data->sctp_out_streams = sctp_new_association_ind->out_streams;
   f1ap_cu_data->default_sctp_stream_id = 0;
-  if (RC.nrrrc[GNB_INSTANCE_TO_MODULE_ID(instance)]->node_type != ngran_gNB_CUCP) {
+  if (RC.nrrrc[instance]->node_type != ngran_gNB_CUCP) {
     getCxt(CUtype, instance)->gtpInst = cu_task_create_gtpu_instance(IPaddrs);
     AssertFatal(getCxt(CUtype, instance)->gtpInst > 0, "Failed to create CU F1-U UDP listener");
   } else

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -958,7 +958,7 @@ int CU_handle_UE_CONTEXT_RELEASE_COMPLETE(instance_t       instance,
   protocol_ctxt_t ctxt;
   PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, instance, ENB_FLAG_YES, rnti, 0, 0, instance);
 
-  struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[instance], rnti);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[instance], rnti);
 
   if (ue_context_p) {
     MessageDef *msg = itti_alloc_new_message(TASK_CU_F1, 0, NGAP_UE_CONTEXT_RELEASE_COMPLETE);

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2904,8 +2904,7 @@ void send_initial_ul_rrc_message(module_id_t        module_id,
 
   /* TODO REMOVE_DU_RRC: the RRC in the DU is a hack and should be taken out in the future */
   if (NODE_IS_DU(RC.nrrrc[module_id]->node_type)) {
-    struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_allocate_new_UE_context(RC.nrrrc[module_id]);
-    ue_context_p->ue_id_rnti                    = rnti;
+    rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_allocate_new_UE_context(RC.nrrrc[module_id]);
     ue_context_p->ue_context.rnti               = rnti;
     ue_context_p->ue_context.random_ue_identity = rnti;
     RB_INSERT(rrc_nr_ue_tree_s, &RC.nrrrc[module_id]->rrc_ue_head, ue_context_p);

openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c

@@ -118,7 +118,7 @@ int dl_rrc_message_rrcSetup(module_id_t module_id, const f1ap_dl_rrc_message_t *
 
   /* TODO: drop the RRC context */
   gNB_RRC_INST *rrc = RC.nrrrc[module_id];
-  struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_get_ue_context(rrc, dl_rrc->rnti);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(rrc, dl_rrc->rnti);
   gNB_RRC_UE_t *ue_p = &ue_context_p->ue_context;
   ue_p->SRB_configList = rrcSetup_ies->radioBearerConfig.srb_ToAddModList;
   ue_p->masterCellGroup = cellGroup;

openair2/RRC/NR/L2_nr_interface.c

@@ -162,8 +162,7 @@ int8_t nr_mac_rrc_bwp_switch_req(const module_id_t     module_idP,
                                  const rnti_t          rntiP,
                                  const int             dl_bwp_id,
                                  const int             ul_bwp_id) {
-
-  struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[module_idP], rntiP);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[module_idP], rntiP);
 
   protocol_ctxt_t ctxt;
   PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, module_idP, GNB_FLAG_YES, rntiP, frameP, sub_frameP, 0);
@@ -177,10 +176,7 @@ void nr_mac_gNB_rrc_ul_failure(const module_id_t Mod_instP,
                                const frame_t frameP,
                                const sub_frame_t subframeP,
                                const rnti_t rntiP) {
-  struct rrc_gNB_ue_context_s *ue_context_p = NULL;
-  ue_context_p = rrc_gNB_get_ue_context(
-                   RC.nrrrc[Mod_instP],
-                   rntiP);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[Mod_instP], rntiP);
 
   if (ue_context_p != NULL) {
     LOG_D(RRC,"Frame %d, Subframe %d: UE %x UL failure, activating timer\n",frameP,subframeP,rntiP);
@@ -195,8 +191,7 @@ void nr_mac_gNB_rrc_ul_failure_reset(const module_id_t Mod_instP,
                                      const frame_t frameP,
                                      const sub_frame_t subframeP,
                                      const rnti_t rntiP) {
-  struct rrc_gNB_ue_context_s *ue_context_p = NULL;
-  ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[Mod_instP], rntiP);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[Mod_instP], rntiP);
   if (ue_context_p != NULL) {
     LOG_W(RRC,"Frame %d, Subframe %d: UE %x UL failure reset, deactivating timer\n",frameP,subframeP,rntiP);
     ue_context_p->ue_context.ul_failure_timer=0;

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1521,10 +1521,7 @@ int16_t do_RRCReconfiguration(
     }
 
     if(cellGroupConfig!=NULL){
-      update_cellGroupConfig(cellGroupConfig,
-                             ue_context_pP->local_uid,
-                             ue_context_pP ? ue_context_pP->ue_context.UE_Capability_nr : NULL,
-                             configuration);
+      update_cellGroupConfig(cellGroupConfig, ue_context_pP->ue_context.gNB_ue_ngap_id, ue_context_pP ? ue_context_pP->ue_context.UE_Capability_nr : NULL, configuration);
 
       enc_rval = uper_encode_to_buffer(&asn_DEF_NR_CellGroupConfig,
                                        NULL,

openair2/RRC/NR/cucp_cuup_direct.c

@@ -187,7 +187,7 @@ static NR_SRB_ToAddModList_t **generateSRB2_confList(gNB_RRC_UE_t *ue, NR_SRB_To
   return SRB_configList2;
 }
 static void cucp_cuup_bearer_context_setup_direct(e1ap_bearer_setup_req_t *const req, instance_t instance) {
-  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[GNB_INSTANCE_TO_MODULE_ID(instance)], req->rnti);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[instance], req->rnti);
   protocol_ctxt_t ctxt = {0};
   PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, GNB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0, 0);
 

openair2/RRC/NR/cucp_cuup_e1ap.c

@@ -36,7 +36,7 @@
 extern RAN_CONTEXT_t RC;
 
 static void cucp_cuup_bearer_context_setup_e1ap(e1ap_bearer_setup_req_t *const req, instance_t instance) {
-  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[GNB_INSTANCE_TO_MODULE_ID(instance)], req->rnti);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[instance], req->rnti);
   protocol_ctxt_t ctxt = {0};
   PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, GNB_FLAG_YES, ue_context_p->ue_context.rnti, 0, 0, 0);
 

openair2/RRC/NR/nr_rrc_defs.h

@@ -269,9 +269,6 @@ typedef struct pdu_session_param_s {
   uint8_t xid; // transaction_id
   NGAP_Cause_PR cause;
   uint8_t cause_value;
-  ngap_pdu_t nas_pdu;
-  ngap_pdu_t pdusessionTransfer;
-
 } rrc_pdu_session_param_t;
 
 typedef struct gNB_RRC_UE_s {
@@ -334,7 +331,7 @@ typedef struct gNB_RRC_UE_s {
   /* Information from S1AP initial_context_setup_req */
   uint32_t                           gNB_ue_s1ap_id :24;
   uint32_t                           gNB_ue_ngap_id;
-  uint64_t                           amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
   nr_rrc_guami_t                     ue_guami;
 
   ngap_security_capabilities_t       security_capabilities;
@@ -404,15 +401,6 @@ typedef struct gNB_RRC_UE_s {
 typedef struct rrc_gNB_ue_context_s {
   /* Tree related data */
   RB_ENTRY(rrc_gNB_ue_context_s) entries;
-
-  /* Uniquely identifies the UE between MME and eNB within the eNB.
-   * This id is encoded on 24bits.
-   */
-  ue_id_t         ue_id_rnti;
-
-  // another key for protocol layers but should not be used as a key for RB tree
-  uid_t          local_uid;
-
   /* UE id for initial connection to NGAP */
   struct gNB_RRC_UE_s   ue_context;
 } rrc_gNB_ue_context_t;

openair2/RRC/NR/nr_rrc_proto.h

@@ -64,11 +64,11 @@ void rrc_gNB_generate_SgNBAdditionRequestAcknowledge(
      rrc_gNB_ue_context_t   *const ue_context_pP
      );
 
-struct rrc_gNB_ue_context_s *rrc_gNB_allocate_new_UE_context(gNB_RRC_INST *rrc_instance_pP);
+rrc_gNB_ue_context_t *rrc_gNB_allocate_new_UE_context(gNB_RRC_INST *rrc_instance_pP);
 
 void rrc_parse_ue_capabilities(gNB_RRC_INST *rrc,NR_UE_CapabilityRAT_ContainerList_t *UE_CapabilityRAT_ContainerList, x2ap_ENDC_sgnb_addition_req_t *m, NR_CG_ConfigInfo_IEs_t * cg_config_info);
 
-void rrc_add_nsa_user(gNB_RRC_INST *rrc,struct rrc_gNB_ue_context_s *ue_context_p, x2ap_ENDC_sgnb_addition_req_t *m);
+void rrc_add_nsa_user(gNB_RRC_INST *rrc, rrc_gNB_ue_context_t *ue_context_p, x2ap_ENDC_sgnb_addition_req_t *m);
 
 void rrc_remove_nsa_user(gNB_RRC_INST *rrc, int rnti);
 
@@ -217,9 +217,5 @@ void nr_pdcp_add_drbs(eNB_flag_t enb_flag,
                       uint8_t *const kUPint,
                       struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_bearer2add_list);
 
-int rrc_gNB_generate_pcch_msg(uint32_t tmsi,
-                              uint8_t paging_drx,
-                              instance_t instance,
-                              uint8_t CC_id);
-
+int rrc_gNB_generate_pcch_msg(uint32_t tmsi, uint8_t paging_drx, instance_t instance, uint8_t CC_id);
 #endif

openair2/RRC/NR/rrc_gNB_GTPV1U.c

@@ -44,26 +44,25 @@
 
 extern RAN_CONTEXT_t RC;
 
-int
-rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
-  const protocol_ctxt_t *const ctxt_pP,
-  const gtpv1u_enb_create_tunnel_resp_t *const create_tunnel_resp_pP,
-  uint8_t                         *inde_list
-) {
-  int                            i;
-  struct rrc_gNB_ue_context_s   *ue_context_p = NULL;
-
-  if (create_tunnel_resp_pP) {
-    LOG_D(RRC, PROTOCOL_RRC_CTXT_UE_FMT" RX CREATE_TUNNEL_RESP num tunnels %u \n",
-          PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
-          create_tunnel_resp_pP->num_tunnels);
-    ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[ctxt_pP->module_id], ctxt_pP->rntiMaybeUEid);
+int rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ctxt_pP, const gtpv1u_enb_create_tunnel_resp_t *const create_tunnel_resp_pP, uint8_t *inde_list)
+{
+  if (!create_tunnel_resp_pP) {
+    LOG_E(NR_RRC, "create_tunnel_resp_pP error\n");
+    return -1;
+  }
 
-    for (i = 0; i < create_tunnel_resp_pP->num_tunnels; i++) {
+  LOG_D(RRC, PROTOCOL_RRC_CTXT_UE_FMT " RX CREATE_TUNNEL_RESP num tunnels %u \n", PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP), create_tunnel_resp_pP->num_tunnels);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[ctxt_pP->module_id], ctxt_pP->rntiMaybeUEid);
+  if (!ue_context_p) {
+    LOG_E(NR_RRC, "UE table error\n");
+    return -1;
+  }
+  for (int i = 0; i < create_tunnel_resp_pP->num_tunnels; i++) {
     ue_context_p->ue_context.gnb_gtp_teid[inde_list[i]] = create_tunnel_resp_pP->enb_S1u_teid[i];
     ue_context_p->ue_context.gnb_gtp_addrs[inde_list[i]] = create_tunnel_resp_pP->enb_addr;
     ue_context_p->ue_context.gnb_gtp_ebi[inde_list[i]] = create_tunnel_resp_pP->eps_bearer_id[i];
-      LOG_I(RRC, PROTOCOL_RRC_CTXT_UE_FMT" rrc_eNB_process_GTPV1U_CREATE_TUNNEL_RESP tunnel (%u, %u) bearer UE context index %u, msg index %u, id %u, gtp addr len %d \n",
+    LOG_I(RRC,
+          PROTOCOL_RRC_CTXT_UE_FMT " rrc_eNB_process_GTPV1U_CREATE_TUNNEL_RESP tunnel (%u, %u) bearer UE context index %u, msg index %u, id %u, gtp addr len %d \n",
           PROTOCOL_RRC_CTXT_UE_ARGS(ctxt_pP),
           create_tunnel_resp_pP->enb_S1u_teid[i],
           ue_context_p->ue_context.gnb_gtp_teid[inde_list[i]],
@@ -74,23 +73,23 @@ rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(
   }
 
   return 0;
-  } else {
-    return -1;
-  }
 }
 
 int nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ctxt_pP, const gtpv1u_gnb_create_tunnel_resp_t *const create_tunnel_resp_pP, int offset)
 {
-  int                            i;
-  struct rrc_gNB_ue_context_s   *ue_context_p = NULL;
+  if (!create_tunnel_resp_pP) {
+    LOG_E(NR_RRC, "create_tunnel_resp_pP error\n");
+    return -1;
+  }
 
-  if (create_tunnel_resp_pP) {
-    LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT" RX CREATE_TUNNEL_RESP num tunnels %u \n",
-          PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-          create_tunnel_resp_pP->num_tunnels);
-    ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[ctxt_pP->module_id], ctxt_pP->rntiMaybeUEid);
+  LOG_D(NR_RRC, PROTOCOL_NR_RRC_CTXT_UE_FMT " RX CREATE_TUNNEL_RESP num tunnels %u \n", PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP), create_tunnel_resp_pP->num_tunnels);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(RC.nrrrc[ctxt_pP->module_id], ctxt_pP->rntiMaybeUEid);
+  if (!ue_context_p) {
+    LOG_E(NR_RRC, "UE table error\n");
+    return -1;
+  }
 
-    for (i = 0; i < create_tunnel_resp_pP->num_tunnels; i++) {
+  for (int i = 0; i < create_tunnel_resp_pP->num_tunnels; i++) {
     ue_context_p->ue_context.gnb_gtp_teid[i + offset] = create_tunnel_resp_pP->gnb_NGu_teid[i];
     ue_context_p->ue_context.gnb_gtp_addrs[i + offset] = create_tunnel_resp_pP->gnb_addr;
     ue_context_p->ue_context.gnb_gtp_psi[i + offset] = create_tunnel_resp_pP->pdusession_id[i];
@@ -105,7 +104,4 @@ int nr_rrc_gNB_process_GTPV1U_CREATE_TUNNEL_RESP(const protocol_ctxt_t *const ct
   }
 
   return 0;
-  } else {
-    return -1;
-  }
 }

openair2/RRC/NR/rrc_gNB_UE_context.c

@@ -38,15 +38,14 @@
 
 
 //------------------------------------------------------------------------------
-int rrc_gNB_compare_ue_rnti_id(
-  struct rrc_gNB_ue_context_s *c1_pP, struct rrc_gNB_ue_context_s *c2_pP)
+int rrc_gNB_compare_ue_rnti_id(rrc_gNB_ue_context_t *c1_pP, rrc_gNB_ue_context_t *c2_pP)
 //------------------------------------------------------------------------------
 {
-  if (c1_pP->ue_id_rnti > c2_pP->ue_id_rnti) {
+  if (c1_pP->ue_context.gNB_ue_ngap_id > c2_pP->ue_context.gNB_ue_ngap_id) {
     return 1;
   }
 
-  if (c1_pP->ue_id_rnti < c2_pP->ue_id_rnti) {
+  if (c1_pP->ue_context.gNB_ue_ngap_id < c2_pP->ue_context.gNB_ue_ngap_id) {
     return -1;
   }
 
@@ -60,22 +59,16 @@ RB_GENERATE(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s, entries,
 
 
 //------------------------------------------------------------------------------
-struct rrc_gNB_ue_context_s *
-rrc_gNB_allocate_new_UE_context(
-  gNB_RRC_INST *rrc_instance_pP
-)
+rrc_gNB_ue_context_t *rrc_gNB_allocate_new_UE_context(gNB_RRC_INST *rrc_instance_pP)
 //------------------------------------------------------------------------------
 {
-  struct rrc_gNB_ue_context_s *new_p;
-  new_p = (struct rrc_gNB_ue_context_s * )malloc(sizeof(struct rrc_gNB_ue_context_s));
+  rrc_gNB_ue_context_t *new_p = calloc(1, sizeof(*new_p));
 
   if (new_p == NULL) {
     LOG_E(RRC, "Cannot allocate new ue context\n");
     return NULL;
   }
-
-  memset(new_p, 0, sizeof(struct rrc_gNB_ue_context_s));
-  new_p->local_uid = uid_linear_allocator_new(&rrc_instance_pP->uid_allocator);
+  new_p->ue_context.gNB_ue_ngap_id = uid_linear_allocator_new(&rrc_instance_pP->uid_allocator);
 
   for(int i = 0; i < NB_RB_MAX; i++) {
     new_p->ue_context.e_rab[i].xid = -1;
@@ -89,35 +82,26 @@ rrc_gNB_allocate_new_UE_context(
 
 
 //------------------------------------------------------------------------------
-struct rrc_gNB_ue_context_s *
-rrc_gNB_get_ue_context(
-  gNB_RRC_INST *rrc_instance_pP,
-  rnti_t rntiP)
+rrc_gNB_ue_context_t *rrc_gNB_get_ue_context(gNB_RRC_INST *rrc_instance_pP, rnti_t rntiP)
 //------------------------------------------------------------------------------
 {
-  rrc_gNB_ue_context_t temp;
-  memset(&temp, 0, sizeof(struct rrc_gNB_ue_context_s));
+  rrc_gNB_ue_context_t temp = {0};
   /* gNB ue rrc id = 24 bits wide */
-  temp.ue_id_rnti = rntiP;
-  struct rrc_gNB_ue_context_s   *ue_context_p = NULL;
-  ue_context_p = RB_FIND(rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head, &temp);
+  temp.ue_context.rnti = rntiP;
+  rrc_gNB_ue_context_t *ue_context_p = RB_FIND(rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head, &temp);
 
-  if ( ue_context_p != NULL) {
+  if (ue_context_p != NULL)
     return ue_context_p;
-  } else {
-    RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &(rrc_instance_pP->rrc_ue_head)) {
-      if (ue_context_p->ue_context.rnti == rntiP) {
+
+  RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &(rrc_instance_pP->rrc_ue_head))
+  {
+    if (ue_context_p->ue_context.rnti == rntiP)
       return ue_context_p;
   }
-    }
   return NULL;
-  }
 }
 
-void rrc_gNB_free_mem_UE_context(
-  const protocol_ctxt_t               *const ctxt_pP,
-  struct rrc_gNB_ue_context_s         *const ue_context_pP
-)
+void rrc_gNB_free_mem_UE_context(const protocol_ctxt_t *const ctxt_pP, rrc_gNB_ue_context_t *const ue_context_pP)
 //-----------------------------------------------------------------------------
 {
 
@@ -133,10 +117,7 @@ void rrc_gNB_free_mem_UE_context(
 }
 
 //------------------------------------------------------------------------------
-void rrc_gNB_remove_ue_context(
-  const protocol_ctxt_t       *const ctxt_pP,
-  gNB_RRC_INST                *rrc_instance_pP,
-  struct rrc_gNB_ue_context_s *ue_context_pP)
+void rrc_gNB_remove_ue_context(const protocol_ctxt_t *const ctxt_pP, gNB_RRC_INST *rrc_instance_pP, rrc_gNB_ue_context_t *ue_context_pP)
 //------------------------------------------------------------------------------
 {
   if (rrc_instance_pP == NULL) {
@@ -153,7 +134,7 @@ void rrc_gNB_remove_ue_context(
 
   RB_REMOVE(rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head, ue_context_pP);
   rrc_gNB_free_mem_UE_context(ctxt_pP, ue_context_pP);
-  uid_linear_allocator_free(&rrc_instance_pP->uid_allocator, ue_context_pP->local_uid);
+  uid_linear_allocator_free(&rrc_instance_pP->uid_allocator, ue_context_pP->ue_context.gNB_ue_ngap_id);
   free(ue_context_pP);
   rrc_instance_pP->Nb_ue --;
   LOG_I(RRC,
@@ -163,14 +144,10 @@ void rrc_gNB_remove_ue_context(
 
 //-----------------------------------------------------------------------------
 // return the ue context if there is already an UE with ue_identityP, NULL otherwise
-struct rrc_gNB_ue_context_s *
-rrc_gNB_ue_context_random_exist(
-  gNB_RRC_INST                *rrc_instance_pP,
-  const uint64_t               ue_identityP
-)
+rrc_gNB_ue_context_t *rrc_gNB_ue_context_random_exist(gNB_RRC_INST *rrc_instance_pP, const uint64_t ue_identityP)
 //-----------------------------------------------------------------------------
 {
-  struct rrc_gNB_ue_context_s        *ue_context_p = NULL;
+  rrc_gNB_ue_context_t *ue_context_p = NULL;
   RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head) {
     if (ue_context_p->ue_context.random_ue_identity == ue_identityP)
       return ue_context_p;
@@ -180,17 +157,13 @@ rrc_gNB_ue_context_random_exist(
 
 //-----------------------------------------------------------------------------
 // return the ue context if there is already an UE with the same S-TMSI, NULL otherwise
-struct rrc_gNB_ue_context_s *
-rrc_gNB_ue_context_5g_s_tmsi_exist(
-    gNB_RRC_INST                *rrc_instance_pP,
-    const uint64_t              s_TMSI
-)
+rrc_gNB_ue_context_t *rrc_gNB_ue_context_5g_s_tmsi_exist(gNB_RRC_INST *rrc_instance_pP, const uint64_t s_TMSI)
 //-----------------------------------------------------------------------------
 {
-    struct rrc_gNB_ue_context_s        *ue_context_p = NULL;
-    RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head) {
-        LOG_I(NR_RRC,"Checking for UE 5G S-TMSI %ld: RNTI %04x\n",
-              s_TMSI, ue_context_p->ue_context.rnti);
+  rrc_gNB_ue_context_t *ue_context_p = NULL;
+  RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head)
+  {
+    LOG_I(NR_RRC, "Checking for UE 5G S-TMSI %ld: RNTI %04x\n", s_TMSI, ue_context_p->ue_context.rnti);
 
     if (ue_context_p->ue_context.ng_5G_S_TMSI_Part1 == s_TMSI) {
       return ue_context_p;
@@ -201,42 +174,23 @@ rrc_gNB_ue_context_5g_s_tmsi_exist(
 
 //-----------------------------------------------------------------------------
 // return a new ue context structure if ue_identityP, ctxt_pP->rnti not found in collection
-struct rrc_gNB_ue_context_s *
-rrc_gNB_get_next_free_ue_context(
-  const protocol_ctxt_t       *const ctxt_pP,
-  gNB_RRC_INST                *rrc_instance_pP,
-  const uint64_t               ue_identityP
-)
+rrc_gNB_ue_context_t *rrc_gNB_get_next_free_ue_context(const protocol_ctxt_t *const ctxt_pP, gNB_RRC_INST *rrc_instance_pP, const uint64_t ue_identityP)
 //-----------------------------------------------------------------------------
 {
-  struct rrc_gNB_ue_context_s        *ue_context_p = NULL;
-  ue_context_p = rrc_gNB_get_ue_context(rrc_instance_pP, ctxt_pP->rntiMaybeUEid);
+  rrc_gNB_ue_context_t *ue_context_p = rrc_gNB_get_ue_context(rrc_instance_pP, ctxt_pP->rntiMaybeUEid);
 
-  if (ue_context_p == NULL) {
-    ue_context_p = rrc_gNB_allocate_new_UE_context(rrc_instance_pP);
+  if (ue_context_p) {
+    LOG_E(NR_RRC, " Cannot create new UE context, already exist rnti: %lx\n", ctxt_pP->rntiMaybeUEid);
+    return ue_context_p;
+  }
 
-    if (ue_context_p == NULL) {
-      LOG_E(NR_RRC,
-            PROTOCOL_NR_RRC_CTXT_UE_FMT" Cannot create new UE context, no memory\n",
-            PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
+  ue_context_p = rrc_gNB_allocate_new_UE_context(rrc_instance_pP);
+  if (ue_context_p == NULL)
     return NULL;
-    }
 
-    ue_context_p->ue_id_rnti = ctxt_pP->rntiMaybeUEid; // here ue_id_rnti is just a key, may be something else
-    ue_context_p->ue_context.rnti = ctxt_pP->rntiMaybeUEid; // yes duplicate, 1 may be removed
+  ue_context_p->ue_context.rnti = ctxt_pP->rntiMaybeUEid;
   ue_context_p->ue_context.random_ue_identity = ue_identityP;
   RB_INSERT(rrc_nr_ue_tree_s, &rrc_instance_pP->rrc_ue_head, ue_context_p);
-    LOG_D(NR_RRC,
-          PROTOCOL_NR_RRC_CTXT_UE_FMT" Created new UE context uid %u\n",
-          PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP),
-          ue_context_p->local_uid);
+  LOG_D(NR_RRC, " Created new UE context rnti: %lx, random ue id %lx, local uid %u\n", ctxt_pP->rntiMaybeUEid, ue_identityP, ue_context_p->ue_context.gNB_ue_ngap_id);
   return ue_context_p;
-  } else {
-    LOG_E(NR_RRC,
-          PROTOCOL_NR_RRC_CTXT_UE_FMT" Cannot create new UE context, already exist\n",
-          PROTOCOL_NR_RRC_CTXT_UE_ARGS(ctxt_pP));
-    return NULL;
-  }
-
-  return(ue_context_p);
 }

openair2/RRC/NR/rrc_gNB_UE_context.h

@@ -34,52 +34,22 @@
 #include "COMMON/platform_types.h"
 #include "nr_rrc_defs.h"
 
-int rrc_gNB_compare_ue_rnti_id(
-  struct rrc_gNB_ue_context_s* c1_pP,
-  struct rrc_gNB_ue_context_s* c2_pP
-);
+int rrc_gNB_compare_ue_rnti_id(rrc_gNB_ue_context_t* c1_pP, rrc_gNB_ue_context_t* c2_pP);
 
 RB_PROTOTYPE(rrc_nr_ue_tree_s, rrc_gNB_ue_context_s, entries, rrc_gNB_compare_ue_rnti_id);
 
-struct rrc_gNB_ue_context_s*
-rrc_gNB_allocate_new_UE_context(
-  gNB_RRC_INST* rrc_instance_pP
-);
+rrc_gNB_ue_context_t* rrc_gNB_allocate_new_UE_context(gNB_RRC_INST* rrc_instance_pP);
 
-struct rrc_gNB_ue_context_s*
-rrc_gNB_get_ue_context(
-  gNB_RRC_INST* rrc_instance_pP,
-  rnti_t rntiP
-);
+rrc_gNB_ue_context_t* rrc_gNB_get_ue_context(gNB_RRC_INST* rrc_instance_pP, rnti_t rntiP);
 
-void rrc_gNB_free_mem_UE_context(
-  const protocol_ctxt_t               *const ctxt_pP,
-  struct rrc_gNB_ue_context_s         *const ue_context_pP
-);
+void rrc_gNB_free_mem_UE_context(const protocol_ctxt_t* const ctxt_pP, rrc_gNB_ue_context_t* const ue_context_pP);
 
-void rrc_gNB_remove_ue_context(
-  const protocol_ctxt_t* const ctxt_pP,
-  gNB_RRC_INST*                rrc_instance_pP,
-  struct rrc_gNB_ue_context_s* ue_context_pP
-);
+void rrc_gNB_remove_ue_context(const protocol_ctxt_t* const ctxt_pP, gNB_RRC_INST* rrc_instance_pP, rrc_gNB_ue_context_t* ue_context_pP);
 
-struct rrc_gNB_ue_context_s *
-rrc_gNB_ue_context_random_exist(
-  gNB_RRC_INST                *rrc_instance_pP,
-  const uint64_t               ue_identityP
-);
+rrc_gNB_ue_context_t* rrc_gNB_ue_context_random_exist(gNB_RRC_INST* rrc_instance_pP, const uint64_t ue_identityP);
 
-struct rrc_gNB_ue_context_s *
-rrc_gNB_ue_context_5g_s_tmsi_exist(
-    gNB_RRC_INST                *rrc_instance_pP,
-    const uint64_t              s_TMSI
-);
+rrc_gNB_ue_context_t* rrc_gNB_ue_context_5g_s_tmsi_exist(gNB_RRC_INST* rrc_instance_pP, const uint64_t s_TMSI);
 
-struct rrc_gNB_ue_context_s *
-rrc_gNB_get_next_free_ue_context(
-  const protocol_ctxt_t       *const ctxt_pP,
-  gNB_RRC_INST                *rrc_instance_pP,
-  const uint64_t               ue_identityP
-);
+rrc_gNB_ue_context_t* rrc_gNB_get_next_free_ue_context(const protocol_ctxt_t* const ctxt_pP, gNB_RRC_INST* rrc_instance_pP, const uint64_t ue_identityP);
 
 #endif

openair2/RRC/NR/rrc_gNB_radio_bearers.c

@@ -22,6 +22,20 @@
 #include "rrc_gNB_radio_bearers.h"
 #include "oai_asn1.h"
 
+rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create)
+{
+  int j;
+  for (j = 0; j < ue->nb_of_pdusessions; j++)
+    if (id == ue->pduSession[j].param.pdusession_id)
+      break;
+  if (j == ue->nb_of_pdusessions && create)
+    ue->nb_of_pdusessions++;
+  else
+    return NULL;
+  AssertFatal(ue->nb_of_pdusessions < NGAP_MAX_PDU_SESSION, "");
+  return ue->pduSession + j;
+}
+
 NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, rrc_pdu_session_param_t *pduSession, bool enable_sdap, int do_drb_integrity, int do_drb_ciphering)
 {
   NR_DRB_ToAddMod_t *DRB_config = CALLOC(1, sizeof(*DRB_config));
@@ -49,8 +63,6 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *ue, uint8_t drb_id, rrc_pdu_session
   {
     asn1cSequenceAdd(sdapFlows->list, NR_QFI_t, qfi);
     *qfi = pduSession->param.qos[qos_flow_index].qfi;
-    asn1cSeqAdd(&SDAP_config->mappedQoS_FlowsToAdd->list, qfi);
-
     if(pduSession->param.qos[qos_flow_index].fiveQI > 5)
       pduSession->param.used_drbs[drb_id - 1] = DRB_ACTIVE_NONGBR;
     else

openair2/RRC/NR/rrc_gNB_radio_bearers.h

@@ -39,4 +39,6 @@ NR_DRB_ToAddMod_t *generateDRB(gNB_RRC_UE_t *rrc_ue, uint8_t drb_id, rrc_pdu_ses
 uint8_t next_available_drb(gNB_RRC_UE_t *ue, rrc_pdu_session_param_t *pdusession, bool is_gbr);
 bool drb_is_active(gNB_RRC_UE_t *ue, uint8_t drb_id);
 
+rrc_pdu_session_param_t *find_pduSession(gNB_RRC_UE_t *ue, int id, bool create);
+
 #endif

openair2/SDAP/nr_sdap/nr_sdap_entity.c

@@ -435,15 +435,10 @@ nr_sdap_entity_t *new_nr_sdap_entity(int is_gnb, bool has_sdap_rx, bool has_sdap
   if(is_defaultDRB) {
     sdap_entity->default_drb = drb_identity;
     LOG_I(SDAP, "Default DRB for the created SDAP entity: %ld \n", sdap_entity->default_drb);
-
-    if(mappedQFIs2AddCount) {
-      LOG_D(SDAP, "RRC updating mapping rules\n");
+    LOG_D(SDAP, "RRC updating mapping rules: %d\n", mappedQFIs2AddCount);
     for (int i = 0; i < mappedQFIs2AddCount; i++)
-      {
       sdap_entity->qfi2drb_map_update(sdap_entity, mapped_qfi_2_add[i], sdap_entity->default_drb, has_sdap_rx, has_sdap_tx);
   }
-    }
-  }
 
   sdap_entity->next_entity = sdap_info.sdap_entity_llist;
   sdap_info.sdap_entity_llist = sdap_entity;

openair3/NAS/NR_UE/nr_nas_msg_sim.c

@@ -859,6 +859,7 @@ void *nas_nrue_task(void *args_p)
       instance = msg_p->ittiMsgHeader.originInstance;
       Mod_id = instance ;
       uicc_t *uicc=checkUicc(Mod_id);
+      LOG_I(NAS, "[UE %d] Received %s\n", Mod_id, ITTI_MSG_NAME(msg_p));
 
       if (instance == INSTANCE_DEFAULT) {
         printf("%s:%d: FATAL: instance is INSTANCE_DEFAULT, should not happen.\n",
@@ -868,21 +869,24 @@ void *nas_nrue_task(void *args_p)
 
       switch (ITTI_MSG_ID(msg_p)) {
         case INITIALIZE_MESSAGE:
-        LOG_I(NAS, "[UE %d] Received %s\n", Mod_id,  ITTI_MSG_NAME (msg_p));
 
           break;
 
         case TERMINATE_MESSAGE:
-        itti_exit_task ();
+          itti_exit_task();
           break;
 
         case MESSAGE_TEST:
-        LOG_I(NAS, "[UE %d] Received %s\n", Mod_id,  ITTI_MSG_NAME (msg_p));
           break;
 
         case NAS_CELL_SELECTION_CNF:
-        LOG_I(NAS, "[UE %d] Received %s: errCode %u, cellID %u, tac %u\n", Mod_id,  ITTI_MSG_NAME (msg_p),
-              NAS_CELL_SELECTION_CNF (msg_p).errCode, NAS_CELL_SELECTION_CNF (msg_p).cellID, NAS_CELL_SELECTION_CNF (msg_p).tac);
+          LOG_I(NAS,
+                "[UE %d] Received %s: errCode %u, cellID %u, tac %u\n",
+                Mod_id,
+                ITTI_MSG_NAME(msg_p),
+                NAS_CELL_SELECTION_CNF(msg_p).errCode,
+                NAS_CELL_SELECTION_CNF(msg_p).cellID,
+                NAS_CELL_SELECTION_CNF(msg_p).tac);
           // as_stmsi_t s_tmsi={0, 0};
           // as_nas_info_t nas_info;
           // plmn_t plmnID={0, 0, 0, 0};
@@ -891,34 +895,30 @@ void *nas_nrue_task(void *args_p)
           break;
 
         case NAS_CELL_SELECTION_IND:
-        LOG_I(NAS, "[UE %d] Received %s: cellID %u, tac %u\n", Mod_id,  ITTI_MSG_NAME (msg_p),
-              NAS_CELL_SELECTION_IND (msg_p).cellID, NAS_CELL_SELECTION_IND (msg_p).tac);
+          LOG_I(NAS, "[UE %d] Received %s: cellID %u, tac %u\n", Mod_id, ITTI_MSG_NAME(msg_p), NAS_CELL_SELECTION_IND(msg_p).cellID, NAS_CELL_SELECTION_IND(msg_p).tac);
 
           /* TODO not processed by NAS currently */
           break;
 
         case NAS_PAGING_IND:
-        LOG_I(NAS, "[UE %d] Received %s: cause %u\n", Mod_id,  ITTI_MSG_NAME (msg_p),
-              NAS_PAGING_IND (msg_p).cause);
+          LOG_I(NAS, "[UE %d] Received %s: cause %u\n", Mod_id, ITTI_MSG_NAME(msg_p), NAS_PAGING_IND(msg_p).cause);
 
           /* TODO not processed by NAS currently */
           break;
 
-      case NAS_CONN_ESTABLI_CNF:
-      {
-        LOG_I(NAS, "[UE %d] Received %s: errCode %u, length %u\n", Mod_id,  ITTI_MSG_NAME (msg_p),
-              NAS_CONN_ESTABLI_CNF (msg_p).errCode, NAS_CONN_ESTABLI_CNF (msg_p).nasMsg.length);
+        case NAS_CONN_ESTABLI_CNF: {
+          LOG_I(NAS, "[UE %d] Received %s: errCode %u, length %u\n", Mod_id, ITTI_MSG_NAME(msg_p), NAS_CONN_ESTABLI_CNF(msg_p).errCode, NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length);
 
-        pdu_buffer = NAS_CONN_ESTABLI_CNF (msg_p).nasMsg.data;
-        msg_type = get_msg_type(pdu_buffer, NAS_CONN_ESTABLI_CNF (msg_p).nasMsg.length);
+          pdu_buffer = NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.data;
+          msg_type = get_msg_type(pdu_buffer, NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length);
 
-        if(msg_type == REGISTRATION_ACCEPT){
+          if (msg_type == REGISTRATION_ACCEPT) {
             LOG_I(NAS, "[UE] Received REGISTRATION ACCEPT message\n");
 
             as_nas_info_t initialNasMsg;
             memset(&initialNasMsg, 0, sizeof(as_nas_info_t));
-          generateRegistrationComplete(Mod_id,&initialNasMsg, NULL);
-          if(initialNasMsg.length > 0){
+            generateRegistrationComplete(Mod_id, &initialNasMsg, NULL);
+            if (initialNasMsg.length > 0) {
               MessageDef *message_p;
               message_p = itti_alloc_new_message(TASK_NAS_NRUE, 0, NAS_UPLINK_DATA_REQ);
               NAS_UPLINK_DATA_REQ(message_p).UEid = Mod_id;
@@ -931,7 +931,7 @@ void *nas_nrue_task(void *args_p)
             as_nas_info_t pduEstablishMsg;
             memset(&pduEstablishMsg, 0, sizeof(as_nas_info_t));
             generatePduSessionEstablishRequest(Mod_id, uicc, &pduEstablishMsg);
-          if(pduEstablishMsg.length > 0){
+            if (pduEstablishMsg.length > 0) {
               MessageDef *message_p;
               message_p = itti_alloc_new_message(TASK_NAS_NRUE, 0, NAS_UPLINK_DATA_REQ);
               NAS_UPLINK_DATA_REQ(message_p).UEid = Mod_id;
@@ -940,8 +940,8 @@ void *nas_nrue_task(void *args_p)
               itti_send_msg_to_task(TASK_RRC_NRUE, instance, message_p);
               LOG_I(NAS, "Send NAS_UPLINK_DATA_REQ message(PduSessionEstablishRequest)\n");
             }
-        } else if(msg_type == FGS_PDU_SESSION_ESTABLISHMENT_ACC){
-          capture_pdu_session_establishment_accept_msg(pdu_buffer, NAS_CONN_ESTABLI_CNF (msg_p).nasMsg.length);
+          } else if (msg_type == FGS_PDU_SESSION_ESTABLISHMENT_ACC) {
+            capture_pdu_session_establishment_accept_msg(pdu_buffer, NAS_CONN_ESTABLI_CNF(msg_p).nasMsg.length);
           }
 
           break;

openair3/NGAP/ngap_gNB.c

@@ -284,70 +284,70 @@ void *ngap_gNB_process_itti_msg(void *notUsed) {
         itti_exit_task();
         break;
 
-      case NGAP_REGISTER_GNB_REQ: {
+      case NGAP_REGISTER_GNB_REQ:
         /* Register a new gNB.
          * in Virtual mode gNBs will be distinguished using the mod_id/
          * Each gNB has to send an NGAP_REGISTER_GNB message with its
          * own parameters.
          */
         ngap_gNB_handle_register_gNB(instance, &NGAP_REGISTER_GNB_REQ(received_msg));
-      } break;
+        break;
 
-      case SCTP_NEW_ASSOCIATION_RESP: {
+      case SCTP_NEW_ASSOCIATION_RESP:
         ngap_gNB_handle_sctp_association_resp(instance, &received_msg->ittiMsg.sctp_new_association_resp);
-      } break;
+        break;
 
-      case SCTP_DATA_IND: {
+      case SCTP_DATA_IND:
         ngap_gNB_handle_sctp_data_ind(&received_msg->ittiMsg.sctp_data_ind);
-      } break;
+        break;
 
-      case NGAP_NAS_FIRST_REQ: {
+      case NGAP_NAS_FIRST_REQ:
         ngap_gNB_handle_nas_first_req(instance, &NGAP_NAS_FIRST_REQ(received_msg));
-      } break;
+        break;
 
-      case NGAP_UPLINK_NAS: {
+      case NGAP_UPLINK_NAS:
         ngap_gNB_nas_uplink(instance, &NGAP_UPLINK_NAS(received_msg));
-      } break;
+        break;
 
-      case NGAP_UE_CAPABILITIES_IND: {
+      case NGAP_UE_CAPABILITIES_IND:
         ngap_gNB_ue_capabilities(instance, &NGAP_UE_CAPABILITIES_IND(received_msg));
-      } break;
+        break;
 
-      case NGAP_INITIAL_CONTEXT_SETUP_RESP: {
+      case NGAP_INITIAL_CONTEXT_SETUP_RESP:
         ngap_gNB_initial_ctxt_resp(instance, &NGAP_INITIAL_CONTEXT_SETUP_RESP(received_msg));
-      } break;
+        break;
 
-      case NGAP_PDUSESSION_SETUP_RESP: {
+      case NGAP_PDUSESSION_SETUP_RESP:
         ngap_gNB_pdusession_setup_resp(instance, &NGAP_PDUSESSION_SETUP_RESP(received_msg));
-      } break;
+        break;
 
-      case NGAP_PDUSESSION_MODIFY_RESP: {
+      case NGAP_PDUSESSION_MODIFY_RESP:
         ngap_gNB_pdusession_modify_resp(instance, &NGAP_PDUSESSION_MODIFY_RESP(received_msg));
-      } break;
+        break;
 
-      case NGAP_NAS_NON_DELIVERY_IND: {
+      case NGAP_NAS_NON_DELIVERY_IND:
         ngap_gNB_nas_non_delivery_ind(instance, &NGAP_NAS_NON_DELIVERY_IND(received_msg));
-      } break;
+        break;
 
-      case NGAP_PATH_SWITCH_REQ: {
+      case NGAP_PATH_SWITCH_REQ:
         ngap_gNB_path_switch_req(instance, &NGAP_PATH_SWITCH_REQ(received_msg));
-      } break;
+        break;
 
-      case NGAP_PDUSESSION_MODIFICATION_IND: {
+      case NGAP_PDUSESSION_MODIFICATION_IND:
         ngap_gNB_generate_PDUSESSION_Modification_Indication(instance, &NGAP_PDUSESSION_MODIFICATION_IND(received_msg));
-      } break;
+        break;
 
-      case NGAP_UE_CONTEXT_RELEASE_COMPLETE: {
+      case NGAP_UE_CONTEXT_RELEASE_COMPLETE:
         ngap_ue_context_release_complete(instance, &NGAP_UE_CONTEXT_RELEASE_COMPLETE(received_msg));
-      } break;
+        break;
 
-      case NGAP_UE_CONTEXT_RELEASE_REQ: {
+      case NGAP_UE_CONTEXT_RELEASE_REQ:
         ngap_ue_context_release_req(instance, &NGAP_UE_CONTEXT_RELEASE_REQ(received_msg));
-      } break;
+        break;
 
-      case NGAP_PDUSESSION_RELEASE_RESPONSE: {
+      case NGAP_PDUSESSION_RELEASE_RESPONSE:
         ngap_gNB_pdusession_release_resp(instance, &NGAP_PDUSESSION_RELEASE_RESPONSE(received_msg));
-      } break;
+        break;
 
       default:
         NGAP_ERROR("Received unhandled message: %d:%s\n", ITTI_MSG_ID(received_msg), ITTI_MSG_NAME(received_msg));

openair3/NGAP/ngap_gNB_context_management_procedures.c

@@ -70,8 +70,7 @@ int ngap_ue_context_release_complete(instance_t instance,
 
   if ((ue_context_p = ngap_get_ue_context(ue_release_complete_p->gNB_ue_ngap_id)) == NULL) {
     /* The context for this gNB ue ngap id doesn't exist in the map of gNB UEs */
-    NGAP_WARN("Failed to find ue context associated with gNB ue ngap id: %u\n",
-              ue_release_complete_p->gNB_ue_ngap_id);
+    NGAP_ERROR("Failed to find ue context associated with gNB ue ngap id: %u\n", ue_release_complete_p->gNB_ue_ngap_id);
     return -1;
   }
 

openair3/NGAP/ngap_gNB_encoder.c

@@ -60,6 +60,7 @@ static inline int ngap_gNB_encode_initiating(NGAP_NGAP_PDU_t *pdu, uint8_t **buf
   }
 
   asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+  AssertFatal(res.result.encoded > 0, "failed to encode NGAP msg\n");
   *buffer = res.buffer;
   *len = res.result.encoded;
   return 0;
@@ -78,11 +79,12 @@ static inline int ngap_gNB_encode_successfull_outcome(NGAP_NGAP_PDU_t *pdu, uint
     if (pdu->choice.successfulOutcome->procedureCode == tmp[i])
       break;
   if (i == sizeofArray(tmp)) {
-    NGAP_WARN("Unknown procedure ID (%d) for successfull outcome message\n", (int)pdu->choice.successfulOutcome->procedureCode);
+    NGAP_WARN("Unknown procedure ID (%ld) for successfull outcome message\n", pdu->choice.successfulOutcome->procedureCode);
     return -1;
   }
 
   asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+  AssertFatal(res.result.encoded > 0, "failed to encode NGAP msg\n");
   *buffer = res.buffer;
   *len = res.result.encoded;
   return 0;
@@ -98,6 +100,7 @@ static inline int ngap_gNB_encode_unsuccessfull_outcome(NGAP_NGAP_PDU_t *pdu, ui
   }
 
   asn_encode_to_new_buffer_result_t res = asn_encode_to_new_buffer(NULL, ATS_ALIGNED_CANONICAL_PER, &asn_DEF_NGAP_NGAP_PDU, pdu);
+  AssertFatal(res.result.encoded > 0, "failed to encode NGAP msg\n");
   *buffer = res.buffer;
   *len = res.result.encoded;
   return 0;
@@ -129,7 +132,6 @@ int ngap_gNB_encode_pdu(NGAP_NGAP_PDU_t *pdu, uint8_t **buffer, uint32_t *len)
       NGAP_DEBUG("Unknown message outcome (%d) or not implemented", (int)pdu->present);
       return -1;
   }
-
   ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_NGAP_NGAP_PDU, pdu);
   return ret;
 }

openair3/NGAP/ngap_gNB_handlers.c

@@ -785,13 +785,8 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
     //DevAssert(ie->value.choice.AllowedNSSAI.list.count > 0);
     //DevAssert(ie->value.choice.AllowedNSSAI.list.count <= NGAP_maxnoofAllowedS_NSSAIs);
 
-    if (ie == NULL) {
-        NGAP_WARN("AllowedNSSAI not present, forging 2 NSSAI\n");
+    AssertFatal(ie, "AllowedNSSAI not present, forging 2 NSSAI\n");
 
-    	msg->nb_allowed_nssais = 2;
-      msg->allowed_nssai[0] = (ngap_allowed_NSSAI_t){.sST = 01, .sD_flag = 1, .sD = {1, 2, 3}};
-      msg->allowed_nssai[1] = (ngap_allowed_NSSAI_t){.sST = 01, .sD_flag = 1, .sD = {0, 0, 1}};
-    } else {
     NGAP_INFO("AllowedNSSAI.list.count %d\n", ie->value.choice.AllowedNSSAI.list.count);
     msg->nb_allowed_nssais = ie->value.choice.AllowedNSSAI.list.count;
     
@@ -802,10 +797,7 @@ int ngap_gNB_handle_initial_context_request(uint32_t   assoc_id,
 
       if(allow_nssai_item_p->s_NSSAI.sD != NULL) {
         msg->allowed_nssai[i].sD_flag = 1;
-        msg->allowed_nssai[i].sD[0] = allow_nssai_item_p->s_NSSAI.sD->buf[0];
-        msg->allowed_nssai[i].sD[1] = allow_nssai_item_p->s_NSSAI.sD->buf[1];
-        msg->allowed_nssai[i].sD[2] = allow_nssai_item_p->s_NSSAI.sD->buf[2];
-      }
+        memcpy(msg->allowed_nssai[i].sD, allow_nssai_item_p->s_NSSAI.sD, sizeof(msg->allowed_nssai[i].sD));
       }
     }
 
@@ -981,8 +973,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
   NGAP_FIND_PROTOCOLIE_BY_ID(NGAP_PDUSessionResourceSetupRequestIEs_t, ie, container,
                          NGAP_ProtocolIE_ID_id_PDUSessionResourceSetupListSUReq, true);
 
-    msg->nb_pdusessions_tosetup =
-      ie->value.choice.PDUSessionResourceSetupListSUReq.list.count;
+  msg->nb_pdusessions_tosetup = ie->value.choice.PDUSessionResourceSetupListSUReq.list.count;
 
   for (int i = 0; i < ie->value.choice.PDUSessionResourceSetupListSUReq.list.count; i++) {
     NGAP_PDUSessionResourceSetupItemSUReq_t *item_p = ie->value.choice.PDUSessionResourceSetupListSUReq.list.array[i];
@@ -990,7 +981,7 @@ int ngap_gNB_handle_pdusession_setup_request(uint32_t         assoc_id,
 
     // S-NSSAI
     OCTET_STRING_TO_INT8(&item_p->s_NSSAI.sST, msg->allowed_nssai[i].sST);
-      if(item_p->s_NSSAI.sD != NULL) {
+    if (item_p->s_NSSAI.sD != NULL) {
       msg->allowed_nssai[i].sD_flag = 1;
       msg->allowed_nssai[i].sD[0] = item_p->s_NSSAI.sD->buf[0];
       msg->allowed_nssai[i].sD[1] = item_p->s_NSSAI.sD->buf[1];

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -169,7 +169,7 @@ int ngap_gNB_handle_nas_first_req(instance_t instance, ngap_nas_first_req_t *UEf
   /* The gNB should allocate a unique gNB UE NGAP ID for this UE. The value
    * will be used for the duration of the connectivity.
    */
-  struct ngap_gNB_ue_context_s *ue_desc_p = calloc(1, sizeof(ue_desc_p));
+  struct ngap_gNB_ue_context_s *ue_desc_p = calloc(1, sizeof(*ue_desc_p));
   DevAssert(ue_desc_p != NULL);
   /* Keep a reference to the selected AMF */
   ue_desc_p->amf_ref       = amf_desc_p;
@@ -639,12 +639,6 @@ int ngap_gNB_initial_ctxt_resp(instance_t instance, ngap_initial_context_setup_r
         asn1cSequenceAdd(pdusessionTransfer.dLQosFlowPerTNLInformation.associatedQosFlowList.list, NGAP_AssociatedQosFlowItem_t, ass_qos_item_p);
         /* qosFlowIdentifier */
         ass_qos_item_p->qosFlowIdentifier = initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qfi;
-
-        /* qosFlowMappingIndication */
-        // if(initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind != QOSFLOW_MAPPING_INDICATION_NON) {
-        //   ass_qos_item_p->qosFlowMappingIndication = malloc(sizeof(*ass_qos_item_p->qosFlowMappingIndication));
-        //   *ass_qos_item_p->qosFlowMappingIndication = initial_ctxt_resp_p->pdusessions[i].associated_qos_flows[j].qos_flow_mapping_ind;
-        //  }
       }
 
       void *pdusessionTransfer_buffer;
@@ -741,7 +735,6 @@ int ngap_gNB_ue_capabilities(instance_t instance, ngap_ue_cap_info_ind_t *ue_cap
 {
   ngap_gNB_instance_t          *ngap_gNB_instance_p;
   struct ngap_gNB_ue_context_s *ue_context_p;
-  NGAP_NGAP_PDU_t pdu;
   uint8_t  *buffer;
   uint32_t length;
   /* Retrieve the NGAP gNB instance associated with Mod_id */
@@ -768,7 +761,7 @@ int ngap_gNB_ue_capabilities(instance_t instance, ngap_ue_cap_info_ind_t *ue_cap
   }
 
   /* Prepare the NGAP message to encode */
-  memset(&pdu, 0, sizeof(pdu));
+  NGAP_NGAP_PDU_t pdu = {0};
   pdu.present = NGAP_NGAP_PDU_PR_initiatingMessage;
   asn1cCalloc(pdu.choice.initiatingMessage, head);
   head->procedureCode = NGAP_ProcedureCode_id_UERadioCapabilityInfoIndication;
@@ -781,7 +774,7 @@ int ngap_gNB_ue_capabilities(instance_t instance, ngap_ue_cap_info_ind_t *ue_cap
     ie->id = NGAP_ProtocolIE_ID_id_AMF_UE_NGAP_ID;
     ie->criticality = NGAP_Criticality_reject;
     ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_AMF_UE_NGAP_ID;
-    // ie->value.choice.AMF_UE_NGAP_ID = ue_context_p->amf_ue_ngap_id;
+    asn_uint642INTEGER(&ie->value.choice.AMF_UE_NGAP_ID, ue_context_p->amf_ue_ngap_id);
   }
   /* mandatory */
   {
@@ -789,7 +782,7 @@ int ngap_gNB_ue_capabilities(instance_t instance, ngap_ue_cap_info_ind_t *ue_cap
     ie->id = NGAP_ProtocolIE_ID_id_RAN_UE_NGAP_ID;
     ie->criticality = NGAP_Criticality_reject;
     ie->value.present = NGAP_UERadioCapabilityInfoIndicationIEs__value_PR_RAN_UE_NGAP_ID;
-    ie->value.choice.RAN_UE_NGAP_ID = ue_cap_info_ind_p->gNB_ue_ngap_id;
+    ie->value.choice.RAN_UE_NGAP_ID = (int64_t)ue_cap_info_ind_p->gNB_ue_ngap_id;
   }
   /* mandatory */
   {

openair3/NGAP/ngap_gNB_ue_context.c

@@ -43,7 +43,7 @@
 /* Tree of UE ordered by gNB_ue_ngap_id's
  * NO INSTANCE, the 32 bits id is large enough to handle all UEs, regardless the cell, gNB, ...
  */
-static RB_HEAD(ngap_ue_map, ngap_gNB_ue_context_s) ngap_ue_head = RB_INITIALIZER(root);
+static RB_HEAD(ngap_ue_map, ngap_gNB_ue_context_s) ngap_ue_head = RB_INITIALIZER(&ngap_ue_head);
 
 /* Generate the tree management functions prototypes */
 RB_PROTOTYPE(ngap_ue_map, ngap_gNB_ue_context_s, entries, ngap_gNB_compare_gNB_ue_ngap_id);
@@ -67,7 +67,7 @@ RB_GENERATE(ngap_ue_map, ngap_gNB_ue_context_s, entries,
 
 void ngap_store_ue_context(struct ngap_gNB_ue_context_s *ue_desc_p)
 {
-  if (!RB_INSERT(ngap_ue_map, &ngap_ue_head, ue_desc_p))
+  if (RB_INSERT(ngap_ue_map, &ngap_ue_head, ue_desc_p))
     LOG_E(NGAP, "Bug in UE uniq number allocation %u, we try to add a existing UE\n", ue_desc_p->gNB_ue_ngap_id);
   return;
 }

openair3/NGAP/ngap_gNB_ue_context.h

@@ -58,8 +58,7 @@ typedef struct ngap_gNB_ue_context_s {
    */
   uint32_t gNB_ue_ngap_id;
 
-  /* Uniquely identifies the UE within AMF. Encoded on 32 bits. */
-  uint64_t amf_ue_ngap_id:40;
+  uint64_t amf_ue_ngap_id;
 
   /* Stream used for this particular UE */
   int32_t tx_stream;