update F1AP to R16.3.1

cmake_targets/CMakeLists.txt

@@ -788,12 +788,12 @@ add_dependencies(X2AP_ENB X2AP_LIB rrc_flag x2_flag)
 
 # F1AP
 ##############
-add_list1_option(F1AP_RELEASE R15 "F1AP ASN.1 grammar version" R15)
+add_list1_option(F1AP_RELEASE R16 "F1AP ASN.1 grammar version" R16)
 set(F1AP_DIR ${OPENAIR2_DIR}/F1AP)
-if (${F1AP_RELEASE} STREQUAL "R15")
-  make_version(F1AP_VERSION 15 2 1)
-  set (ASN1RELDIR R15.2.1)
-endif(${F1AP_RELEASE} STREQUAL "R15")
+if (${F1AP_RELEASE} STREQUAL "R16")
+  make_version(F1AP_VERSION 16 3 1)
+  set (ASN1RELDIR R16.3.1)
+endif(${F1AP_RELEASE} STREQUAL "R16")
 add_definitions(-DF1AP_VERSION=${F1AP_VERSION})
 set(F1AP_ASN_DIR ${F1AP_DIR}/MESSAGES/ASN1/${ASN1RELDIR})
 set(F1AP_ASN_FILES

openair2/F1AP/f1ap_common.h

@@ -46,7 +46,6 @@
 inline void ASN_DEBUG(const char *fmt, ...);
 #endif
 
-#include "F1AP_Active-Cells-List.h"
 #include "F1AP_RAT-FrequencyPriorityInformation.h"
 #include "F1AP_DLUPTNLInformation-ToBeSetup-Item.h"
 #include "F1AP_PrivateMessage.h"
@@ -55,6 +54,7 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_NRPCI.h"
 #include "F1AP_Transmission-Bandwidth.h"
 #include "F1AP_SIB1-message.h"
+#include "F1AP_SibtypetobeupdatedListItem.h"
 #include "F1AP_GNBCUConfigurationUpdateAcknowledge.h"
 #include "F1AP_DRBs-Setup-Item.h"
 #include "F1AP_EUTRA-NR-CellResourceCoordinationReqAck-Container.h"
@@ -75,7 +75,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_DRBs-Required-ToBeModified-Item.h"
 #include "F1AP_BitRate.h"
 #include "F1AP_SRBs-ToBeSetup-List.h"
-#include "F1AP_ConcurrentWarningMessageIndicator.h"
 #include "F1AP_CriticalityDiagnostics-IE-Item.h"
 #include "F1AP_GNB-CU-TNL-Association-To-Update-List.h"
 #include "F1AP_DRB-Notify-List.h"
@@ -85,6 +84,7 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_PWS-Failed-NR-CGI-List.h"
 #include "F1AP_InitialULRRCMessageTransfer.h"
 #include "F1AP_Served-Cell-Information.h"
+#include "F1AP_ServedPLMNs-Item.h"
 #include "F1AP_Served-EUTRA-Cells-Information.h"
 #include "F1AP_Cells-Broadcast-Cancelled-Item.h"
 #include "F1AP_F1SetupRequest.h"
@@ -128,13 +128,11 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_TransactionID.h"
 #include "F1AP_AllocationAndRetentionPriority.h"
 #include "F1AP_ShortDRXCycleLength.h"
-#include "F1AP_BroadcastPLMNs-Item.h"
 #include "F1AP_DRB-Information.h"
 #include "F1AP_TimeToWait.h"
 #include "F1AP_NonDynamic5QIDescriptor.h"
 #include "F1AP_C-RNTI.h"
 #include "F1AP_MIB-message.h"
-#include "F1AP_SIBtype-Item.h"
 #include "F1AP_Served-Cells-To-Modify-List.h"
 #include "F1AP_NRCGI.h"
 #include "F1AP_DuplicationActivation.h"
@@ -187,6 +185,7 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_CellULConfigured.h"
 #include "F1AP_DRB-Activity.h"
 #include "F1AP_GNB-CU-TNL-Association-Failed-To-Setup-Item.h"
+#include "F1AP_ProtocolIE-ID.h"
 #include "F1AP_PrivateIE-ID.h"
 #include "F1AP_WriteReplaceWarningResponse.h"
 #include "F1AP_CauseMisc.h"
@@ -231,9 +230,7 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_SUL-Information.h"
 #include "F1AP_CriticalityDiagnostics-IE-List.h"
 #include "F1AP_EUTRA-FDD-Info.h"
-#include "F1AP_BroadcastPLMNs-List.h"
 #include "F1AP_Served-Cells-To-Delete-Item.h"
-#include "F1AP_ListofEUTRACellsinGNBDUCoordination.h"
 #include "F1AP_Candidate-SpCell-Item.h"
 #include "F1AP_Cells-To-Be-Broadcast-List.h"
 #include "F1AP_ULRRCMessageTransfer.h"
@@ -255,7 +252,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_SRBs-ToBeReleased-List.h"
 #include "F1AP_MeasGapConfig.h"
 #include "F1AP_NR-Mode-Info.h"
-#include "F1AP_Active-Cells-Item.h"
 #include "F1AP_Protected-EUTRA-Resources-List.h"
 #include "F1AP_SRBs-FailedToBeSetup-Item.h"
 #include "F1AP_ResetAll.h"
@@ -287,7 +283,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_UEContextReleaseRequest.h"
 #include "F1AP_GNB-DU-Name.h"
 #include "F1AP_DRBs-ToBeModified-Item.h"
-#include "F1AP_SIBtype-List.h"
 #include "F1AP_EUTRA-NR-CellResourceCoordinationReq-Container.h"
 #include "F1AP_DRBs-SetupMod-List.h"
 #include "F1AP_DRBs-Required-ToBeModified-List.h"
@@ -296,7 +291,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_PacketDelayBudget.h"
 #include "F1AP_GNBCUConfigurationUpdate.h"
 #include "F1AP_Cells-Broadcast-Completed-Item.h"
-#include "F1AP_RRCRconfigurationCompleteIndicator.h"
 #include "F1AP_PagingPriority.h"
 #include "F1AP_Cells-Failed-to-be-Activated-List.h"
 #include "F1AP_Endpoint-IP-address-and-port.h"
@@ -306,7 +300,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_ResetType.h"
 #include "F1AP_FDD-Info.h"
 #include "F1AP_DLUPTNLInformation-ToBeSetup-List.h"
-#include "F1AP_QoSFlowIndicator.h"
 #include "F1AP_NR-CGI-List-For-Restart-List.h"
 #include "F1AP_F1SetupResponse.h"
 #include "F1AP_UEContextSetupResponse.h"
@@ -325,7 +318,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_Cells-to-be-Barred-List.h"
 #include "F1AP_Presence.h"
 #include "F1AP_CellBarred.h"
-#include "F1AP_SIBtype.h"
 #include "F1AP_RequestType.h"
 #include "F1AP_NRFreqInfo.h"
 #include "F1AP_Potential-SpCell-Item.h"
@@ -348,7 +340,6 @@ inline void ASN_DEBUG(const char *fmt, ...);
 #include "F1AP_GBR-QoSFlowInformation.h"
 #include "F1AP_SCellIndex.h"
 #include "F1AP_DRBs-SetupMod-Item.h"
-#include "F1AP_TransmissionStopIndicator.h"
 #include "F1AP_UEContextSetupFailure.h"
 #include "F1AP_DRBs-FailedToBeModified-List.h"
 #include "F1AP_DRBs-FailedToBeSetupMod-Item.h"

openair2/F1AP/f1ap_cu_interface_management.c

@@ -140,10 +140,11 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
     served_celles_item_p = &(((F1AP_GNB_DU_Served_Cells_ItemIEs_t *)ie->value.choice.GNB_DU_Served_Cells_List.list.array[i])->value.choice.GNB_DU_Served_Cells_Item);
     
     /* tac */
-    OCTET_STRING_TO_INT16(&(served_celles_item_p->served_Cell_Information.fiveGS_TAC), F1AP_SETUP_REQ(message_p).tac[i]);
-    LOG_D(F1AP, "F1AP_SETUP_REQ(message_p).tac[%d] %d \n",
-          i, F1AP_SETUP_REQ(message_p).tac[i]);
-
+    if (served_celles_item_p->served_Cell_Information.fiveGS_TAC) {
+      OCTET_STRING_TO_INT16(served_celles_item_p->served_Cell_Information.fiveGS_TAC, F1AP_SETUP_REQ(message_p).tac[i]);
+      LOG_D(F1AP, "F1AP_SETUP_REQ(message_p).tac[%d] %d \n",
+            i, F1AP_SETUP_REQ(message_p).tac[i]);
+    }
     /* - nRCGI */
     TBCD_TO_MCC_MNC(&(served_celles_item_p->served_Cell_Information.nRCGI.pLMN_Identity), F1AP_SETUP_REQ(message_p).mcc[i],
                     F1AP_SETUP_REQ(message_p).mnc[i],
@@ -352,7 +353,7 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
 
     /* optional */
     /* - gNB-CU System Information */
-    if (1) {
+    if (0) {
       /* 3.1.2 gNB-CUSystem Information */
       F1AP_Cells_to_be_Activated_List_ItemExtIEs_t *cells_to_be_activated_list_itemExtIEs;
       cells_to_be_activated_list_itemExtIEs = (F1AP_Cells_to_be_Activated_List_ItemExtIEs_t *)calloc(1, sizeof(F1AP_Cells_to_be_Activated_List_ItemExtIEs_t));
@@ -365,20 +366,32 @@ int CU_send_F1_SETUP_RESPONSE(instance_t instance,
       //for (int n = 0; n < f1ap_setup_resp->SI_container_length[i][0]; n++)
       //  printf("%02x ", f1ap_setup_resp->SI_container[i][0][n]);
       //printf("\n");
-      OCTET_STRING_fromBuf(&gNB_CUSystemInformation->sImessage,
-                           (const char*)f1ap_setup_resp->SI_container[i][0], 
-                           f1ap_setup_resp->SI_container_length[i][0]);
 
-      LOG_D(F1AP, "f1ap_setup_resp->SI_container_length = %d \n", f1ap_setup_resp->SI_container_length[0][0]);
+      if (0) {
+        for (int sIBtype=2;sIBtype<33;sIBtype++) {
+          if (f1ap_setup_resp->SI_container[i][sIBtype]!=NULL) {
+            AssertFatal(sIBtype < 6 || sIBtype == 9, "Illegal SI type %d\n",sIBtype);
+            F1AP_SibtypetobeupdatedListItem_t *sib_item = calloc(1,sizeof(*sib_item));
+            memset((void*)sib_item,0,sizeof(*sib_item));
+            sib_item->sIBtype = sIBtype;
+            OCTET_STRING_fromBuf(&sib_item->sIBmessage,
+                                (const char*)f1ap_setup_resp->SI_container[i][sIBtype], 
+                                f1ap_setup_resp->SI_container_length[i][sIBtype]);
+          
+            LOG_D(F1AP, "f1ap_setup_resp->SI_container_length[%d][%d] = %d \n", i,sIBtype,f1ap_setup_resp->SI_container_length[i][sIBtype]);
+            ASN_SEQUENCE_ADD(&gNB_CUSystemInformation->sibtypetobeupdatedlist.list,sib_item);
+          }
+        }
+      }
       cells_to_be_activated_list_itemExtIEs->extensionValue.choice.GNB_CUSystemInformation = *gNB_CUSystemInformation;
 
 
-      F1AP_ProtocolExtensionContainer_160P9_t p_160P9_t;
-      memset((void *)&p_160P9_t, 0, sizeof(F1AP_ProtocolExtensionContainer_160P9_t));
+      F1AP_ProtocolExtensionContainer_154P112_t p_154P112_t;
+      memset((void *)&p_154P112_t, 0, sizeof(F1AP_ProtocolExtensionContainer_154P112_t));
 
-      ASN_SEQUENCE_ADD(&p_160P9_t.list,
+      ASN_SEQUENCE_ADD(&p_154P112_t.list,
                       cells_to_be_activated_list_itemExtIEs);
-      cells_to_be_activated_list_item.iE_Extensions = (struct F1AP_ProtocolExtensionContainer*)&p_160P9_t;
+      cells_to_be_activated_list_item.iE_Extensions = (struct F1AP_ProtocolExtensionContainer*)&p_154P112_t;
 
       free(gNB_CUSystemInformation);
       gNB_CUSystemInformation = NULL;
@@ -838,17 +851,13 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, module_id_t du_mod_
        protected_eutra_resources_item_ies = (F1AP_Protected_EUTRA_Resources_ItemIEs_t *)calloc(1, sizeof(F1AP_Protected_EUTRA_Resources_ItemIEs_t));
        protected_eutra_resources_item_ies->id = F1AP_ProtocolIE_ID_id_Protected_EUTRA_Resources_List;
        protected_eutra_resources_item_ies->criticality = F1AP_Criticality_reject;
-       protected_eutra_resources_item_ies->value.present = F1AP_Protected_EUTRA_Resources_ItemIEs__value_PR_SpectrumSharingGroupID;
-       protected_eutra_resources_item_ies->value.choice.SpectrumSharingGroupID = 1L;
-
+       protected_eutra_resources_item_ies->value.present = F1AP_Protected_EUTRA_Resources_ItemIEs__value_PR_Protected_EUTRA_Resources_Item;
+       ((F1AP_Protected_EUTRA_Resources_Item_t*)&protected_eutra_resources_item_ies->value.choice.Protected_EUTRA_Resources_Item)->spectrumSharingGroupID = 123L;
+       memset(&protected_eutra_resources_item_ies->value.choice.Protected_EUTRA_Resources_Item,0,
+	      sizeof(F1AP_Protected_EUTRA_Resources_Item_t));
        ASN_SEQUENCE_ADD(&ie->value.choice.Protected_EUTRA_Resources_List.list, protected_eutra_resources_item_ies);
 
-       /* 8.2 ListofEUTRACellsinGNBDUCoordination */
-       protected_eutra_resources_item_ies = (F1AP_Protected_EUTRA_Resources_ItemIEs_t *)calloc(1, sizeof(F1AP_Protected_EUTRA_Resources_ItemIEs_t));
-       protected_eutra_resources_item_ies->id = F1AP_ProtocolIE_ID_id_Protected_EUTRA_Resources_List;
-       protected_eutra_resources_item_ies->criticality = F1AP_Criticality_reject;
-       protected_eutra_resources_item_ies->value.present = F1AP_Protected_EUTRA_Resources_ItemIEs__value_PR_ListofEUTRACellsinGNBDUCoordination;
-
+/*
        F1AP_Served_EUTRA_Cells_Information_t served_eutra_cells_information;
        memset((void *)&served_eutra_cells_information, 0, sizeof(F1AP_Served_EUTRA_Cells_Information_t));
 
@@ -879,6 +888,7 @@ int CU_send_gNB_CU_CONFIGURATION_UPDATE(instance_t instance, module_id_t du_mod_
        ASN_SEQUENCE_ADD(&protected_eutra_resources_item_ies->value.choice.ListofEUTRACellsinGNBDUCoordination.list, &served_eutra_cells_information);
 
        ASN_SEQUENCE_ADD(&ie->value.choice.Protected_EUTRA_Resources_List.list, protected_eutra_resources_item_ies);
+*/
   }
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
 

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -109,7 +109,7 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t             instance,
   /* RNTI */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_InitialULRRCMessageTransferIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_C_RNTI, true);
-  BUFFER_TO_INT16(ie->value.choice.C_RNTI.buf, rnti);
+  rnti = ie->value.choice.C_RNTI;
 
   /* RRC Container */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_InitialULRRCMessageTransferIEs_t, ie, container,
@@ -316,19 +316,24 @@ int CU_send_DL_RRC_MESSAGE_TRANSFER(instance_t                instance,
   /* c7. RAT_FrequencyPriorityInformation */
   /* TODO */ 
   if (0) {
+    int endc=1;
     ie = (F1AP_DLRRCMessageTransferIEs_t *)calloc(1, sizeof(F1AP_DLRRCMessageTransferIEs_t));
     ie->id                            = F1AP_ProtocolIE_ID_id_RAT_FrequencyPriorityInformation;
     ie->criticality                   = F1AP_Criticality_reject;
     ie->value.present                 = F1AP_DLRRCMessageTransferIEs__value_PR_RAT_FrequencyPriorityInformation;
-
-    ie->value.choice.RAT_FrequencyPriorityInformation.present = F1AP_RAT_FrequencyPriorityInformation_PR_subscriberProfileIDforRFP;
-    ie->value.choice.RAT_FrequencyPriorityInformation.choice.subscriberProfileIDforRFP = 123L;
-
-    //ie->value.choice.RAT_FrequencyPriorityInformation.present = F1AP_RAT_FrequencyPriorityInformation_PR_rAT_FrequencySelectionPriority;
-    //ie->value.choice.RAT_FrequencyPriorityInformation.choice.rAT_FrequencySelectionPriority = 123L;
+    if (endc==1) {
+      ie->value.choice.RAT_FrequencyPriorityInformation.present = F1AP_RAT_FrequencyPriorityInformation_PR_eNDC;
+      ie->value.choice.RAT_FrequencyPriorityInformation.choice.eNDC = 123L;
+    }
+    else {
+      ie->value.choice.RAT_FrequencyPriorityInformation.present = F1AP_RAT_FrequencyPriorityInformation_PR_nGRAN;
+      ie->value.choice.RAT_FrequencyPriorityInformation.choice.nGRAN = 11L;
+    }
+      //ie->value.choice.RAT_FrequencyPriorityInformation.present = F1AP_RAT_FrequencyPriorityInformation_PR_rAT_FrequencySelectionPriority;
+      //ie->value.choice.RAT_FrequencyPriorityInformation.choice.rAT_FrequencySelectionPriority = 123L;
     ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
   }
- 
+
   /* encode */
   if (f1ap_encode_pdu(&pdu, &buffer, &len) < 0) {
     LOG_E(F1AP, "Failed to encode F1 DL RRC MESSAGE TRANSFER \n");

openair2/F1AP/f1ap_du_rrc_message_transfer.c

@@ -179,10 +179,10 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t       instance,
                              F1AP_ProtocolIE_ID_id_RAT_FrequencyPriorityInformation, true);
 
     switch(ie->value.choice.RAT_FrequencyPriorityInformation.present) {
-      case F1AP_RAT_FrequencyPriorityInformation_PR_subscriberProfileIDforRFP:
+      case F1AP_RAT_FrequencyPriorityInformation_PR_eNDC:
         //subscriberProfileIDforRFP = ie->value.choice.RAT_FrequencyPriorityInformation.choice.subscriberProfileIDforRFP;
         break;
-      case F1AP_RAT_FrequencyPriorityInformation_PR_rAT_FrequencySelectionPriority:
+      case F1AP_RAT_FrequencyPriorityInformation_PR_nGRAN:
         //rAT_FrequencySelectionPriority = ie->value.choice.RAT_FrequencyPriorityInformation.choice.rAT_FrequencySelectionPriority;
         break;
       default:
@@ -854,7 +854,7 @@ int DU_send_INITIAL_UL_RRC_MESSAGE_TRANSFER(module_id_t     module_idP,
   ie->id                             = F1AP_ProtocolIE_ID_id_C_RNTI;
   ie->criticality                    = F1AP_Criticality_reject;
   ie->value.present                  = F1AP_InitialULRRCMessageTransferIEs__value_PR_C_RNTI;
-  C_RNTI_TO_BIT_STRING(rntiP, &ie->value.choice.C_RNTI);
+  ie->value.choice.C_RNTI=rntiP;
   ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
 
   /* mandatory */
@@ -1218,10 +1218,10 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t       instance,
                              F1AP_ProtocolIE_ID_id_RAT_FrequencyPriorityInformation, true);
 
     switch(ie->value.choice.RAT_FrequencyPriorityInformation.present) {
-      case F1AP_RAT_FrequencyPriorityInformation_PR_subscriberProfileIDforRFP:
+      case F1AP_RAT_FrequencyPriorityInformation_PR_eNDC:
         //subscriberProfileIDforRFP = ie->value.choice.RAT_FrequencyPriorityInformation.choice.subscriberProfileIDforRFP;
         break;
-      case F1AP_RAT_FrequencyPriorityInformation_PR_rAT_FrequencySelectionPriority:
+      case F1AP_RAT_FrequencyPriorityInformation_PR_nGRAN:
         //rAT_FrequencySelectionPriority = ie->value.choice.RAT_FrequencyPriorityInformation.choice.rAT_FrequencySelectionPriority;
         break;
       default:

openair2/F1AP/f1ap_du_ue_context_management.c

@@ -91,7 +91,7 @@ int DU_handle_UE_CONTEXT_SETUP_REQUEST(instance_t       instance,
   BIT_STRING_TO_NR_CELL_IDENTITY(&ie->value.choice.NRCGI.nRCellIdentity, f1ap_ue_context_setup_req->nr_cellid);
   /* ServCellIndex */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextSetupRequestIEs_t, ie, container,
-                             F1AP_ProtocolIE_ID_id_ServCellndex, true);
+                             F1AP_ProtocolIE_ID_id_ServCellIndex, true);
   f1ap_ue_context_setup_req->servCellIndex = ie->value.choice.ServCellIndex;
   /* optional */
   /* CellULConfigured */
@@ -256,7 +256,8 @@ int DU_send_UE_CONTEXT_SETUP_RESPONSE(instance_t instance) {
     ie->id                             = F1AP_ProtocolIE_ID_id_C_RNTI;
     ie->criticality                    = F1AP_Criticality_ignore;
     ie->value.present                  = F1AP_UEContextSetupResponseIEs__value_PR_C_RNTI;
-    C_RNTI_TO_BIT_STRING(rntiP, &ie->value.choice.C_RNTI);
+    //C_RNTI_TO_BIT_STRING(rntiP, &ie->value.choice.C_RNTI);
+    ie->value.choice.C_RNTI=rntiP;
     ASN_SEQUENCE_ADD(&out->protocolIEs.list, ie);
   }
 
@@ -1045,7 +1046,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance) {
     srbs_failedToBeSetupMod_item.sRBID = 50L;
     srbs_failedToBeSetupMod_item.cause = (F1AP_Cause_t *)calloc(1, sizeof(F1AP_Cause_t));
     srbs_failedToBeSetupMod_item.cause->present = F1AP_Cause_PR_radioNetwork;
-    srbs_failedToBeSetupMod_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnd_du_ue_f1ap_id;
+    srbs_failedToBeSetupMod_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnb_du_ue_f1ap_id;
     /* ADD */
     srbs_failedToBeSetupMod_item_ies->value.choice.SRBs_FailedToBeSetupMod_Item = srbs_failedToBeSetupMod_item;
     ASN_SEQUENCE_ADD(&ie->value.choice.SRBs_FailedToBeSetupMod_List.list,
@@ -1076,7 +1077,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance) {
     drbs_failedToBeSetupMod_item.dRBID = 30L;
     drbs_failedToBeSetupMod_item.cause = (F1AP_Cause_t *)calloc(1, sizeof(F1AP_Cause_t));
     drbs_failedToBeSetupMod_item.cause->present = F1AP_Cause_PR_radioNetwork;
-    drbs_failedToBeSetupMod_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnd_du_ue_f1ap_id;
+    drbs_failedToBeSetupMod_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnb_du_ue_f1ap_id;
     /* ADD */
     drbs_failedToBeSetupMod_item_ies->value.choice.DRBs_FailedToBeSetupMod_Item = drbs_failedToBeSetupMod_item;
     ASN_SEQUENCE_ADD(&ie->value.choice.DRBs_FailedToBeSetupMod_List.list,
@@ -1112,7 +1113,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance) {
     scell_failedtoSetupMod_item.sCell_ID = nRCGI;
     scell_failedtoSetupMod_item.cause = (F1AP_Cause_t *)calloc(1, sizeof(F1AP_Cause_t));
     scell_failedtoSetupMod_item.cause->present = F1AP_Cause_PR_radioNetwork;
-    scell_failedtoSetupMod_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnd_du_ue_f1ap_id;
+    scell_failedtoSetupMod_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnb_du_ue_f1ap_id;
     /* ADD */
     scell_failedtoSetupMod_item_ies->value.choice.SCell_FailedtoSetupMod_Item = scell_failedtoSetupMod_item;
     ASN_SEQUENCE_ADD(&ie->value.choice.SCell_FailedtoSetupMod_List.list,
@@ -1143,7 +1144,7 @@ int DU_send_UE_CONTEXT_MODIFICATION_RESPONSE(instance_t instance) {
     drbs_failedToBeModified_item.dRBID = 30L;
     drbs_failedToBeModified_item.cause = (F1AP_Cause_t *)calloc(1, sizeof(F1AP_Cause_t));
     drbs_failedToBeModified_item.cause->present = F1AP_Cause_PR_radioNetwork;
-    drbs_failedToBeModified_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnd_du_ue_f1ap_id;
+    drbs_failedToBeModified_item.cause->choice.radioNetwork = F1AP_CauseRadioNetwork_unknown_or_already_allocated_gnb_du_ue_f1ap_id;
     /* ADD */
     drbs_failedToBeModified_item_ies->value.choice.DRBs_FailedToBeModified_Item = drbs_failedToBeModified_item;
     ASN_SEQUENCE_ADD(&ie->value.choice.DRBs_FailedToBeModified_List.list,

openair2/RRC/NR/rrc_gNB.c

@@ -218,7 +218,6 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
   rrc->carrier.sizeof_SIB1      = do_SIB1_NR(&rrc->carrier,configuration);
   LOG_I(NR_RRC,"Done init_NR_SI\n");
   if (!NODE_IS_CU(RC.nrrrc[0]->node_type)){
-    printf("################ init_NR_SI rrc_mac_config_req_gNB \n");
     rrc_mac_config_req_gNB(rrc->module_id,
                           rrc->carrier.ssb_SubcarrierOffset,
                           rrc->carrier.pdsch_AntennaPorts,
@@ -277,7 +276,9 @@ static void init_NR_SI(gNB_RRC_INST *rrc, gNB_RrcConfigurationReq *configuration
     } else {
       struct rrc_gNB_ue_context_s *ue_context_p = rrc_gNB_allocate_new_UE_context(rrc);
       LOG_I(NR_RRC,"Adding new user (%p)\n",ue_context_p);
-      // rrc_add_nsa_user(rrc,ue_context_p,NULL);
+      if (!NODE_IS_CU(RC.nrrrc[0]->node_type)) {
+        rrc_add_nsa_user(rrc,ue_context_p,NULL);
+      }
     }
   }
 }