code review, CI result configuration issues, gcc warnings

ci-scripts/conf_files/cu.band7.tm1.100PRB.conf

@@ -13,7 +13,7 @@ eNBs = (
 
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code = 1;
-    plmn_list = ( { mcc = 450; mnc = 05; mnc_length = 2; } )
+    plmn_list = ( { mcc = 208; mnc = 92; mnc_length = 2; } )
 
     nr_cellid = 12345678L
 
@@ -179,7 +179,7 @@ eNBs = (
     ////////// MME parameters:
     mme_ip_address  = (
       {
-        ipv4       = "192.168.5.233";
+        ipv4       = "CI_MME_IP_ADDR";
         ipv6       = "192:168:30::17";
         port       = 36412 ;
         active     = "yes";
@@ -189,11 +189,11 @@ eNBs = (
 
     NETWORK_INTERFACES : {
       ENB_INTERFACE_NAME_FOR_S1_MME = "eth0";
-      ENB_IPV4_ADDRESS_FOR_S1_MME   = "192.168.5.244";
+      ENB_IPV4_ADDRESS_FOR_S1_MME   = "CI_ENB_IP_ADDR";
       ENB_INTERFACE_NAME_FOR_S1U    = "eth0";
-      ENB_IPV4_ADDRESS_FOR_S1U      = "192.168.5.244";
+      ENB_IPV4_ADDRESS_FOR_S1U      = "CI_ENB_IP_ADDR";
       ENB_PORT_FOR_S1U              = 2152; # Spec 2152
-      ENB_IPV4_ADDRESS_FOR_X2C      = "192.168.5.244";
+      ENB_IPV4_ADDRESS_FOR_X2C      = "CI_ENB_IP_ADDR";
       ENB_PORT_FOR_X2C              = 36422; # Spec 36422
     };
   }

ci-scripts/conf_files/gNB_SA_CU.conf

@@ -17,8 +17,8 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
     plmn_list = ({
-                  mcc = 450;
-                  mnc = 05;
+                  mcc = 208;
+                  mnc = 99;
                   mnc_length = 2;
                   snssaiList = (        
                     {        
@@ -66,10 +66,10 @@ gNBs =
     NETWORK_INTERFACES :
     {
 
-        GNB_INTERFACE_NAME_FOR_NG_AMF            = "enp0s31f6:";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.5.244/24";
+        GNB_INTERFACE_NAME_FOR_NG_AMF            = "eth0";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "CI_GNB_IP_ADDR";
         GNB_INTERFACE_NAME_FOR_NGU               = "bond0";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.5.244/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = ""CI_GNB_IP_ADDR";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
     };
   }

ci-scripts/conf_files/gNB_SA_DU.conf

@@ -16,8 +16,8 @@ gNBs =
     // Tracking area code, 0x0000 and 0xfffe are reserved values
     tracking_area_code  =  1;
     plmn_list = ({
-                  mcc = 450;
-                  mnc = 05;
+                  mcc = 208;
+                  mnc = 99;
                   mnc_length = 2;
                   snssaiList = (        
                     {        

openair2/F1AP/f1ap_cu_interface_management.c

@@ -221,7 +221,7 @@ int CU_handle_F1_SETUP_REQUEST(instance_t instance,
     }
   } else {
     CU_send_F1_SETUP_FAILURE(instance);
-    itti_free(TASK_RRC_GNB,message_p);
+    itti_free(TASK_CU_F1,message_p);
     return -1;
   }
 

openair2/F1AP/f1ap_cu_rrc_message_transfer.c

@@ -288,28 +288,9 @@ int CU_handle_UL_RRC_MESSAGE_TRANSFER(instance_t       instance,
   /* RRC Container */
   F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_ULRRCMessageTransferIEs_t, ie, container,
                              F1AP_ProtocolIE_ID_id_RRCContainer, true);
-  // print message in debug mode
-  // create an ITTI message and copy SDU
-  /*
-
-  message_p = itti_alloc_new_message (TASK_CU_F1, 0, RRC_DCCH_DATA_IND);
-
-  RRC_DCCH_DATA_IND (message_p).sdu_p = malloc(ie->value.choice.RRCContainer.size);
-
-  RRC_DCCH_DATA_IND (message_p).sdu_size = ie->value.choice.RRCContainer.size;
-  memcpy(RRC_DCCH_DATA_IND (message_p).sdu_p, ie->value.choice.RRCContainer.buf,
-         ie->value.choice.RRCContainer.size);
-
-  RRC_DCCH_DATA_IND (message_p).dcch_index = srb_id;
-  RRC_DCCH_DATA_IND (message_p).rnti = f1ap_get_rnti_by_cu_id(CUtype, instance, cu_ue_f1ap_id);
-  RRC_DCCH_DATA_IND (message_p).instance = instance;
-  RRC_DCCH_DATA_IND (message_p).eNB_index = instance; // not needed for CU
-
-  itti_send_msg_to_task(TASK_RRC_ENB, instance, message_p);
-  */
   protocol_ctxt_t ctxt;
   ctxt.instance = instance;
-  ctxt.instance = instance;
+  ctxt.module_id = instance;
   ctxt.rnti = f1ap_get_rnti_by_cu_id(CUtype, instance, cu_ue_f1ap_id);
   ctxt.enb_flag = 1;
   ctxt.eNB_index = 0;

openair2/F1AP/f1ap_du_task.c

@@ -85,11 +85,6 @@ void du_task_handle_sctp_association_resp(instance_t instance, sctp_new_associat
   f1ap_du_data->sctp_out_streams = sctp_new_association_resp->out_streams;
   f1ap_du_data->default_sctp_stream_id = 0;
   /* setup parameters for F1U and start the server */
-  eth_params_t *tmp;
-  if ( RC.nrmac )
-    tmp= &RC.nrmac[instance]->eth_params_n;
-  else
-    tmp= &RC.mac[instance]->eth_params_n;
 
   DU_send_F1_SETUP_REQUEST(instance);
 }

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -537,16 +537,16 @@ rb_found:
 	  __func__, rb_id, size);
     extern instance_t CUuniqInstance;
     itti_send_msg_to_task(TASK_VARIABLE, CUuniqInstance, message_p);
-    return;
-  }
+  } else {
     
-  memblock = get_free_mem_block(size, __FUNCTION__);
-  memcpy(memblock->data, buf, size);
-
-  LOG_D(PDCP, "%s(): (srb %d) calling rlc_data_req size %d\n", __func__, rb_id, size);
-  //for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
-  //printf("\n");
-  enqueue_rlc_data_req(&ctxt, 0, MBMS_FLAG_NO, rb_id, sdu_id, 0, size, memblock);
+    memblock = get_free_mem_block(size, __FUNCTION__);
+    memcpy(memblock->data, buf, size);
+    
+    LOG_D(PDCP, "%s(): (srb %d) calling rlc_data_req size %d\n", __func__, rb_id, size);
+    //for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
+    //printf("\n");
+    enqueue_rlc_data_req(&ctxt, 0, MBMS_FLAG_NO, rb_id, sdu_id, 0, size, memblock);
+  }
 }
 
 static void deliver_sdu_srb(void *_ue, nr_pdcp_entity_t *entity,

openair3/ocp-gtpu/gtp_itf.cpp

@@ -601,7 +601,7 @@ int newGtpuDeleteTunnel(instance_t instance, rnti_t rnti) {
   auto it=inst->ue2te_mapping.find(rnti);
 
   if ( it == inst->ue2te_mapping.end() ) {
-    LOG_W(GTPU,"[%ld] Delete a non existing GTP tunnel\n", instance);
+    LOG_W(GTPU,"[%ld] Delete GTP tunnels for rnti: %x, but no tunnel exits\n", instance, rnti);
     pthread_mutex_unlock(&globGtp.gtp_lock);
     return -1;
   }
@@ -617,7 +617,7 @@ int newGtpuDeleteTunnel(instance_t instance, rnti_t rnti) {
 
   inst->ue2te_mapping.erase(it);
   pthread_mutex_unlock(&globGtp.gtp_lock);
-  LOG_I(GTPU, "[%ld] Deleted all tunnels for RNTI %d (%d tunnels deleted)\n", instance, rnti, nb);
+  LOG_I(GTPU, "[%ld] Deleted all tunnels for RNTI %x (%d tunnels deleted)\n", instance, rnti, nb);
   return !GTPNOK;
 }
 
@@ -639,7 +639,7 @@ static int Gtpv1uHandleEchoReq(int h,
                                uint32_t msgBufLen,
                                uint16_t peerPort,
                                uint32_t peerIp) {
-  LOG_E(GTPU,"to be dev\n");
+  LOG_E(GTPU,"EchoReq reply to be dev\n");
   int rc = GTPNOK;
   return rc;
 }
@@ -649,7 +649,7 @@ static int Gtpv1uHandleError(int h,
                              uint32_t msgBufLen,
                              uint16_t peerPort,
                              uint32_t peerIp) {
-  LOG_E(GTPU,"to be dev\n");
+  LOG_E(GTPU,"Hadle error to be dev\n");
   int rc = GTPNOK;
   return rc;
 }
@@ -659,7 +659,7 @@ static int Gtpv1uHandleSupportedExt(int h,
                                     uint32_t msgBufLen,
                                     uint16_t peerPort,
                                     uint32_t peerIp) {
-  LOG_E(GTPU,"to be dev\n");
+  LOG_E(GTPU,"Supported extensions to be dev\n");
   int rc = GTPNOK;
   return rc;
 }