Remove useless code

in PDCP, NAS

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -1027,16 +1027,6 @@ bool nr_pdcp_data_req_drb(protocol_ctxt_t *ctxt_pP,
   nr_pdcp_entity_t *rb;
   ue_id_t ue_id = ctxt_pP->rntiMaybeUEid;
 
-  if (ctxt_pP->module_id != 0 ||
-      //ctxt_pP->enb_flag != 1 ||
-      ctxt_pP->instance != 0 ||
-      ctxt_pP->eNB_index != 0 /*||
-      ctxt_pP->configured != 1 ||
-      ctxt_pP->brOption != 0*/) {
-    LOG_E(PDCP, "%s:%d:%s: fatal\n", __FILE__, __LINE__, __FUNCTION__);
-    exit(1);
-  }
-
   nr_pdcp_manager_lock(nr_pdcp_ue_manager);
 
   ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, ue_id);

openair2/RRC/NAS/nas_config.c

@@ -410,23 +410,6 @@ int nas_config(int interface_id, int thirdOctet, int fourthOctet, char *ifname,
   return returnValue;
 }
 
-// Blocking full configuration of the interface (address, net mask, and broadcast mask)
-int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress) {
-  char command[200];
-  command[0]='\0';
-  strcat(command, "ifconfig ");
-  strncat(command, interfaceName, sizeof(command) - strlen(command) - 1);
-  strncat(command, " ", sizeof(command) - strlen(command) - 1);
-  strncat(command, ipAddress, sizeof(command) - strlen(command) - 1);
-  strncat(command, " networkMask ", sizeof(command) - strlen(command) - 1);
-  strncat(command, networkMask, sizeof(command) - strlen(command) - 1);
-  strncat(command, " broadcast ", sizeof(command) - strlen(command) - 1);
-  strncat(command, broadcastAddress, sizeof(command) - strlen(command) - 1);
-  // ifconfig nasmesh0 10.0.1.1 networkMask 255.255.255.0 broadcast 10.0.1.255
-  int i = system (command);
-  return i;
-}
-
 // program help
 void helpOptions(char **argv) {
   printf("Help for %s\n",  argv[0]);

openair2/RRC/NAS/nas_config.h

@@ -89,19 +89,6 @@ int nas_config_mbms(int interface_id, int thirdOctet, int fourthOctet, char *ifs
  */
 int nas_config_mbms_s1(int interface_id, int thirdOctet, int fourthOctet, char *ifsuffix);
 
-/*! \fn int  blocking_NAS_config(char*, char*, char*, char*)
- * \brief This function initializes the nasmesh interface, in a blocking way,
- * the system calls are interrupted
- * \param[in] interfaceName, the name of the interface, e.g. nasmesh0 or nasmesh1
- * \param[in] ipAddress, the address of the interface, e.g. 10.0.1.1
- * \param[in] networkMask, the network mask to be used, e.g. 255.255.255.0
- * \param[in] broadcastAddress, the broadcast address for the subnet, e.g. 10.0.1.255
- * \return 0 on success, otherwise 1
- * \note
- * @ingroup  _nas
- */
-int blocking_NAS_config(char *interfaceName, char *ipAddress, char *networkMask, char *broadcastAddress);
-
 /*! \fn int  setInterfaceParameter(char*, char*, int)
  * \brief This function sets an genneric interface parameter (SIOCSIFADDR,
  * SIOCSIFNETMASK, SIOCSIFBRDADDR, SIOCSIFFLAGS)

openair2/SDAP/nr_sdap/nr_sdap.c

@@ -55,13 +55,7 @@ static void *gnb_tun_read_thread(void *arg)
     if (!has_ue)
       continue;
 
-    ctxt.module_id = 0;
     ctxt.enb_flag = 1;
-    ctxt.instance = 0;
-    ctxt.frame = 0;
-    ctxt.subframe = 0;
-    ctxt.eNB_index = 0;
-    ctxt.brOption = 0;
     ctxt.rntiMaybeUEid = UEid;
 
     uint8_t qfi = 7;
@@ -134,13 +128,7 @@ static void *ue_tun_read_thread(void *arg)
 
     LOG_D(PDCP, "%s(): pdusession_sock read returns len %d\n", __func__, len);
 
-    ctxt.module_id = 0;
     ctxt.enb_flag = 0;
-    ctxt.instance = 0;
-    ctxt.frame = 0;
-    ctxt.subframe = 0;
-    ctxt.eNB_index = 0;
-    ctxt.brOption = 0;
     ctxt.rntiMaybeUEid = entity->ue_id;
 
     bool dc = SDAP_HDR_UL_DATA_PDU;