Remove unused code in ETH_TRANSPORT/{socket,multicast_link}.{ch}

CMakeLists.txt

@@ -1887,8 +1887,6 @@ target_include_directories(SIMU PUBLIC ${OPENAIR1_DIR}/SIMULATION/TOOLS ${OPENAI
 
 add_library(SIMU_ETH STATIC
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/multicast_link.c
-  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/socket.c
 )
 target_link_libraries(SIMU_ETH PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs)
 

doc/Doxyfile

@@ -2309,11 +2309,7 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/proto.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/netlink_init.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/multicast_link.c \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/socket.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/ETH_TRANSPORT/defs.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/adc.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../openair1/SIMULATION/RF/dac.c \

executables/lte-ue.c

@@ -80,11 +80,6 @@ void init_UE_threads_stub(int);
 void init_UE_single_thread_stub(int);
 void *UE_thread(void *arg);
 int init_timer_thread(void);
-extern void multicast_link_start(void (*rx_handlerP) (unsigned int, char *),
-                                 unsigned char _multicast_group,
-                                 char *multicast_ifname);
-extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
-
 
 int tx_req_num_elems;
 extern uint16_t sf_ahead;
@@ -364,10 +359,9 @@ void init_UE_stub_single_thread(int nb_inst,
   init_UE_single_thread_stub(nb_inst);
   printf("UE threads created \n");
 
-  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF && NFAPI_MODE!=NFAPI_MODE_STANDALONE_PNF) {
-    LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
-    multicast_link_start(ue_stub_rx_handler,0,emul_iface);
-  }
+  AssertFatal(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF,
+              "unsupported NFAPI mode %d\n",
+              NFAPI_MODE);
 }
 
 void init_UE_standalone_thread(int ue_idx) {
@@ -408,8 +402,9 @@ void init_UE_stub(int nb_inst,
   printf("UE threads created \n");
   LOG_I(PHY,"Starting multicast link on %s\n",emul_iface);
 
-  if(NFAPI_MODE!=NFAPI_UE_STUB_PNF && NFAPI_MODE!=NFAPI_MODE_STANDALONE_PNF)
-    multicast_link_start(ue_stub_rx_handler,0,emul_iface);
+  AssertFatal(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF,
+              "unsupported NFAPI mode %d\n",
+              NFAPI_MODE);
 }
 
 
@@ -2356,15 +2351,7 @@ static void *timer_thread( void *param ) {
       }
 
       nanosleep(&t_sleep, (struct timespec *)NULL);
-      UE_tport_t pdu;
-      pdu.header.packet_type = TTI_SYNC;
-      pdu.header.absSF = (timer_frame*10)+timer_subframe;
-
-      if (NFAPI_MODE != NFAPI_UE_STUB_PNF && NFAPI_MODE != NFAPI_MODE_STANDALONE_PNF) {
-        multicast_link_write_sock(0,
-                                  (char *)&pdu,
-                                  sizeof(UE_tport_header_t));
-      }
+      AssertFatal(NFAPI_MODE == NFAPI_UE_STUB_PNF || NFAPI_MODE == NFAPI_MODE_STANDALONE_PNF, "unsupported NFAPI mode %d\n", NFAPI_MODE);
     } else {
       wait_on_condition(&UE->timer_mutex,&UE->timer_cond,&UE->instance_cnt_timer,"timer_thread");
       release_thread(&UE->timer_mutex,&UE->instance_cnt_timer,"timer_thread");

openair1/PHY/LTE_UE_TRANSPORT/sldch.c

@@ -31,8 +31,6 @@
  */
 #include "PHY/defs_UE.h"
 
-extern int multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
-
 void generate_sldch(PHY_VARS_UE *ue,SLDCH_t *sldch,int frame_tx,int subframe_tx) {
 
   UE_tport_t pdu;
@@ -54,10 +52,5 @@ void generate_sldch(PHY_VARS_UE *ue,SLDCH_t *sldch,int frame_tx,int subframe_tx)
         sldch->payload_length,
         sldch_header_len+sizeof(SLDCH_t)-sizeof(uint8_t*)+sldch->payload_length);
 
-  multicast_link_write_sock(0,
-                            (char *)&pdu,
-                            sldch_header_len+sizeof(SLDCH_t));
-
+  AssertFatal(false, "multicast_link_write_sock() not implemented\n");
 }
-
-

openair1/PHY/LTE_UE_TRANSPORT/slsch.c

@@ -31,10 +31,6 @@
  */
 #include "PHY/defs_UE.h"
 
-extern int
-multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP);
-
-
 void generate_slsch(PHY_VARS_UE *ue,SLSCH_t *slsch,int frame_tx,int subframe_tx) {
 
   UE_tport_t pdu;
@@ -58,9 +54,6 @@ void generate_slsch(PHY_VARS_UE *ue,SLSCH_t *slsch,int frame_tx,int subframe_tx)
 	  slsch->payload_length,
 	  slsch_header_len+sizeof(SLSCH_t)-sizeof(uint8_t*)+slsch->payload_length);
     
-    multicast_link_write_sock(0, 
-			      (char *)&pdu,
-			      slsch_header_len+sizeof(SLSCH_t)-sizeof(uint8_t*)+slsch->payload_length);
-    
+    AssertFatal(false, "multicast_link_write_sock() not implemented\n");
   }
 }

openair1/SIMULATION/ETH_TRANSPORT/multicast_link.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file multicast_link.h
- *  \brief
- *  \author Lionel Gauthier and Navid Nikaein
- *  \date 2011
- *  \version 1.1
- *  \company Eurecom
- *  \email: navid.nikaein@eurecom.fr
- */
-
-#ifndef __MULTICAST_LINK_H__
-#    define __MULTICAST_LINK_H__
-#    ifdef MULTICAST_LINK_C
-#        define private_multicast_link(x) x
-#        define public_multicast_link(x) x
-#    else
-#        define private_multicast_link(x)
-#        define public_multicast_link(x) extern x
-#    endif
-#    include "stdint.h"
-
-private_multicast_link (typedef struct multicast_group_t {
-  int      socket;
-  struct sockaddr_in sock_remote_addr;
-  char     host_addr[16];
-  uint16_t port;
-  char     rx_buffer[40000];
-} multicast_group_t;)
-
-#define MULTICAST_LINK_NUM_GROUPS 4
-
-extern const char *multicast_group_list[MULTICAST_LINK_NUM_GROUPS];
-
-private_multicast_link(void  multicast_link_init (void));
-private_multicast_link(void  multicast_link_read_data (int groupP));
-private_multicast_link(void  multicast_link_read (void));
-private_multicast_link(void *multicast_link_main_loop (void *param));
-
-public_multicast_link(int   multicast_link_write_sock (int groupP, char *dataP, uint32_t sizeP));
-public_multicast_link(void  multicast_link_start (  void (*rx_handlerP) (unsigned int, char*), unsigned char multicast_group, char * multicast_ifname));
-# ifdef BYPASS_PHY
-public_multicast_link(pthread_mutex_t Bypass_phy_wr_mutex);
-public_multicast_link(pthread_cond_t Bypass_phy_wr_cond);
-public_multicast_link(char Bypass_phy_wr);
-# endif //BYPASS_PHY
-#endif

openair1/SIMULATION/ETH_TRANSPORT/socket.c

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file socket.c
-* \brief
-* \author Lionel Gauthier
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-//#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <assert.h>
-
-#define SOCKET_C
-//#include "openair_defs.h"
-#include "socket.h"
-
-#define msg printf
-//------------------------------------------------------------------------------
-void
-socket_setnonblocking (int sockP)
-{
-  //------------------------------------------------------------------------------
-
-  int             opts;
-
-  opts = fcntl (sockP, F_GETFL);
-
-  if (opts < 0) {
-    perror ("fcntl(F_GETFL)");
-    exit (EXIT_FAILURE);
-  }
-
-  opts = (opts | O_NONBLOCK);
-
-  if (fcntl (sockP, F_SETFL, opts) < 0) {
-    perror ("fcntl(F_SETFL)");
-    exit (EXIT_FAILURE);
-  }
-
-  return;
-}
-
-//------------------------------------------------------------------------------
-int
-make_socket_inet (int typeP, uint16_t * portP, struct sockaddr_in *ptr_addressP)
-{
-  //------------------------------------------------------------------------------
-
-  int             sock;
-  unsigned int             length = sizeof (struct sockaddr_in);
-  struct sockaddr_in name;
-
-
-  assert ((typeP == SOCK_STREAM) || (typeP == SOCK_DGRAM));
-
-  /* Create the socket. */
-  sock = socket (PF_INET, typeP, 0);
-
-  if (sock < 0) {
-    fprintf (stderr, "ERROR: %s line %d socket %m", __FILE__, __LINE__);
-    exit (EXIT_FAILURE);
-  }
-
-  /* Give the socket a name. */
-  name.sin_family = AF_INET;
-  name.sin_port = htons (*portP);
-  name.sin_addr.s_addr = htonl (INADDR_ANY);
-
-  if (bind (sock, (struct sockaddr *) &name, sizeof (name)) < 0) {
-    close (sock);
-    fprintf (stderr, "ERROR: %s line %d bind port %d %m", __FILE__, __LINE__, *portP);
-    exit (EXIT_FAILURE);
-  }
-
-  if (ptr_addressP != NULL) {
-    getsockname (sock, (struct sockaddr *) ptr_addressP, &length);
-  }
-
-  msg("[SOCKET] bound socket port %d\n", *portP);
-  return sock;
-}
-

openair1/SIMULATION/ETH_TRANSPORT/socket.h

-/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-/*! \file socket.h
-* \brief
-* \author Lionel Gauthier
-* \date 2011
-* \version 1.0
-* \company Eurecom
-* \email: lionel.gauthier@eurecom.fr
-*/
-
-#ifndef __SIMULATION_ETH_TRANSPORT_SOCKET__H__
-#define __SIMULATION_ETH_TRANSPORT_SOCKET__H__
-
-#    ifdef SOCKET_C
-#        define private_socket(x) x
-#        define public_socket(x) x
-#    else
-#        define private_socket(x)
-#        define public_socket(x) extern x
-#    endif
-#    include "stdint.h"
-public_socket (void socket_setnonblocking (int sockP);
-              )
-public_socket (int make_socket_inet (int typeP, uint16_t * portP, struct sockaddr_in *ptr_addressP);
-              )
-#endif

openair1/SIMULATION/LTE_PHY/dummy_functions.c

@@ -47,8 +47,6 @@ SLDCH_t *ue_get_sldch(module_id_t module_idP, int CC_id,frame_t frameP, sub_fram
 
 SLSCH_t *ue_get_slsch(module_id_t module_idP, int CC_id,frame_t frameP, sub_frame_t subframe) {return(NULL);}
 
-void multicast_link_write_sock(int groupP, char *dataP, uint32_t sizeP) {}
-
 uint16_t
 ue_process_rar(const module_id_t module_idP,
 	       const int CC_id,