fix some warnings

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -188,7 +188,7 @@ int CU_handle_INITIAL_UL_RRC_MESSAGE_TRANSFER(instance_t             instance,
     ctxt.configured = 1;
     mem_block_t *mb = get_free_mem_block(ie->value.choice.RRCContainer.size,__func__);
     memcpy((void*)mb->data,(void*)ie->value.choice.RRCContainer.buf,ie->value.choice.RRCContainer.size);
-    LOG_I(F1AP, "Calling pdcp_data_ind for UE RNTI %x srb_id %lu with size %ld (DCCH) \n", ctxt.rnti, 1, ie->value.choice.RRCContainer.size);
+    LOG_I(F1AP, "Calling pdcp_data_ind for UE RNTI %x srb_id %d with size %ld (DCCH) \n", ctxt.rnti, 1, ie->value.choice.RRCContainer.size);
 
     LOG_I(F1AP, "%s() RRCContainer size %lu: ", __func__, ie->value.choice.RRCContainer.size);
     for (int i = 0; i < ie->value.choice.RRCContainer.size; i++)
@@ -358,7 +358,6 @@ int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t       instance,
   
   F1AP_ULRRCMessageTransfer_t    *container;
   F1AP_ULRRCMessageTransferIEs_t *ie;
-  MessageDef                     *message_p;
   
   uint64_t        cu_ue_f1ap_id;
   uint64_t        du_ue_f1ap_id;
@@ -409,21 +408,6 @@ int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t       instance,
 
   // create an ITTI message and copy SDU
 
-//   message_p = itti_alloc_new_message (TASK_CU_F1, NR_RRC_DCCH_DATA_IND);
-
-//   NR_RRC_DCCH_DATA_IND (message_p).sdu_p = malloc(ie->value.choice.RRCContainer.size);
-
-//   NR_RRC_DCCH_DATA_IND (message_p).sdu_size = ie->value.choice.RRCContainer.size;
-//   memcpy(NR_RRC_DCCH_DATA_IND (message_p).sdu_p, ie->value.choice.RRCContainer.buf,
-//          ie->value.choice.RRCContainer.size);
-
-//   NR_RRC_DCCH_DATA_IND (message_p).dcch_index = srb_id;
-//   NR_RRC_DCCH_DATA_IND (message_p).rnti = f1ap_get_rnti_by_cu_id(&f1ap_cu_inst[instance], cu_ue_f1ap_id);
-//   NR_RRC_DCCH_DATA_IND (message_p).module_id = instance;
-//   NR_RRC_DCCH_DATA_IND (message_p).gNB_index = instance; // not needed for CU
-
-//   itti_send_msg_to_task(TASK_RRC_GNB, instance, message_p);
-
   /*
   
   message_p = itti_alloc_new_message (TASK_CU_F1, RRC_DCCH_DATA_IND);

openair2/F1AP/f1ap_cu_ue_context_management.c

@@ -778,7 +778,7 @@ if (0) {
   //   return -1;
   // }
 
-  LOG_D(F1AP,"F1AP UEContextSetupRequest Encoded %zd bits\n", len);
+  LOG_D(F1AP,"F1AP UEContextSetupRequest Encoded %u bits\n", len);
 
   cu_f1ap_itti_send_sctp_data_req(instance, f1ap_assoc_id /* BK: fix me*/ , buffer, len, 0 /* BK: fix me*/);
 

openair2/F1AP/f1ap_du_rrc_message_transfer.c

@@ -1391,17 +1391,12 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t       instance,
 
               if (rrcReconfiguration_ies->radioBearerConfig) {
                 LOG_I(F1AP, "Radio Resource Configuration is present\n");
-                uint8_t DRB2LCHAN[8];
                 long drb_id;
                 int i;
                 NR_DRB_ToAddModList_t  *DRB_configList  = rrcReconfiguration_ies->radioBearerConfig->drb_ToAddModList;
                 NR_SRB_ToAddModList_t  *SRB_configList  = rrcReconfiguration_ies->radioBearerConfig->srb_ToAddModList;
                 // NR_DRB_ToReleaseList_t *DRB_ReleaseList = rrcReconfiguration_ies->radioBearerConfig->drb_ToReleaseList;
 
-                for (i = 0; i< 8; i++){
-                  DRB2LCHAN[i] = 0;
-                }
-
                 // rrc_rlc_config_asn1_req
 
                 if (SRB_configList != NULL) {
@@ -1485,8 +1480,8 @@ int DU_handle_DL_NR_RRC_MESSAGE_TRANSFER(instance_t       instance,
 
   LOG_I(F1AP, "Received DL RRC Transfer on srb_id %ld\n", srb_id);
 
-  rlc_op_status_t    rlc_status;
-  boolean_t          ret             = TRUE;
+//   rlc_op_status_t    rlc_status;
+//   boolean_t          ret             = TRUE;
   mem_block_t       *pdcp_pdu_p      = NULL; 
   pdcp_pdu_p = get_free_mem_block(rrc_dl_sdu_len, __func__);
 

openair2/GNB_APP/gnb_config.c

@@ -1433,9 +1433,6 @@ int du_check_plmn_identity(rrc_gNB_carrier_data_t *carrier,uint16_t mcc,uint16_t
                                             ->plmn_IdentityList.list.array[0];
 
   // check if mcc is different and return failure if so
-  LOG_I(GNB_APP, "plmn_Identity->mcc: %d%d%d\n", *plmn_Identity->mcc->list.array[0],
-                                                  *plmn_Identity->mcc->list.array[1],
-                                                  *plmn_Identity->mcc->list.array[2]);
   if (mcc !=
       ((*plmn_Identity->mcc->list.array[0])*100)+
       ((*plmn_Identity->mcc->list.array[1])*10) +
@@ -1456,7 +1453,7 @@ int du_check_plmn_identity(rrc_gNB_carrier_data_t *carrier,uint16_t mcc,uint16_t
       (mnc !=
        (*plmn_Identity->mnc.list.array[0]*10) +
        (*plmn_Identity->mnc.list.array[1]))) {
-    LOG_E(GNB_APP, "mnc(%d) in F1AP_SETUP_RESP message is different from mnc(%d%d) in DU \n",
+    LOG_E(GNB_APP, "mnc(%d) in F1AP_SETUP_RESP message is different from mnc(%ld%ld) in DU \n",
                     mnc, *plmn_Identity->mnc.list.array[0], *plmn_Identity->mnc.list.array[1]);
     return(0);
   }
@@ -1465,7 +1462,7 @@ int du_check_plmn_identity(rrc_gNB_carrier_data_t *carrier,uint16_t mcc,uint16_t
             (*plmn_Identity->mnc.list.array[0]*100) +
             (*plmn_Identity->mnc.list.array[1]*10) +
             (*plmn_Identity->mnc.list.array[2]))) {
-    LOG_E(GNB_APP, "mnc(%d) in F1AP_SETUP_RESP message is different from mnc(%d%d%d) in DU \n",
+    LOG_E(GNB_APP, "mnc(%d) in F1AP_SETUP_RESP message is different from mnc(%ld%ld%ld) in DU \n",
                     mnc, *plmn_Identity->mnc.list.array[0], *plmn_Identity->mnc.list.array[1], *plmn_Identity->mnc.list.array[2]);
     return(0);
   }

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -304,9 +304,9 @@ uint8_t do_SIB1_NR(rrc_gNB_carrier_data_t *carrier,
   struct NR_PLMN_Identity *nr_plmn = CALLOC(1, sizeof(struct NR_PLMN_Identity) * num_plmn);
   NR_MCC_MNC_Digit_t (*nr_mcc_digit)[3] = (NR_MCC_MNC_Digit_t(*)[3])CALLOC(1, sizeof(NR_MCC_MNC_Digit_t)*num_plmn*3);
   NR_MCC_MNC_Digit_t (*nr_mnc_digit)[3] = (NR_MCC_MNC_Digit_t(*)[3])CALLOC(1, sizeof(NR_MCC_MNC_Digit_t)*num_plmn*3);;
-  memset(nr_plmn,0,sizeof(nr_plmn));
-  memset(nr_mcc_digit,0,sizeof(nr_mcc_digit));
-  memset(nr_mnc_digit,0,sizeof(nr_mnc_digit));
+  memset(nr_plmn,0,sizeof(struct NR_PLMN_Identity) * num_plmn);
+  memset(nr_mcc_digit,0,sizeof(NR_MCC_MNC_Digit_t)*num_plmn*3);
+  memset(nr_mnc_digit,0,sizeof(NR_MCC_MNC_Digit_t)*num_plmn*3);
   
   //  struct NR_UAC_BarringInfoSet nr_uac_BarringInfoSet;
   NR_BCCH_DL_SCH_Message_t *sib1_message = CALLOC(1,sizeof(NR_BCCH_DL_SCH_Message_t));