Rename tun_if.{c,h} => tuntap_if.c{c,h}

The next commit introduces functions to also manage TAP interfaces.

common/utils/CMakeLists.txt

@@ -14,7 +14,7 @@ add_subdirectory(nr)
 add_subdirectory(LOG)
 add_subdirectory(threadPool)
 add_subdirectory(time_manager)
-add_library(utils utils.c system.c time_meas.c time_stat.c tun_if.c)
+add_library(utils utils.c system.c time_meas.c time_stat.c tuntap_if.c)
 target_include_directories(utils PUBLIC .)
 target_link_libraries(utils PRIVATE ${T_LIB})
 if (ENABLE_TESTS)

common/utils/tuntap_if.c

@@ -30,7 +30,7 @@
 #include <linux/if_tun.h>
 #include <linux/netlink.h>
 
-#include "tun_if.h"
+#include "tuntap_if.h"
 #include "common/platform_constants.h"
 #include "common/utils/LOG/log.h"
 #include "common/utils/system.h"

doc/Doxyfile

@@ -866,8 +866,8 @@ INPUT                  = \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/config/config_cmdline.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/time_meas.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tun_if.h \
-@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tun_if.c \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tuntap_if.h \
+@CMAKE_CURRENT_SOURCE_DIR@/../common/utils/tuntap_if.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/utils.c \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/oai_asn1.h \
 @CMAKE_CURRENT_SOURCE_DIR@/../common/utils/system.h \

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -49,7 +49,7 @@
 #include "common/ngran_types.h"
 #include "common/openairinterface5g_limits.h"
 #include "executables/lte-softmodem.h"
-#include "common/utils/tun_if.h"
+#include "common/utils/tuntap_if.h"
 #include "intertask_interface.h"
 #include "openair3/S1AP/s1ap_eNB.h"
 #include <pthread.h>

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -46,7 +46,7 @@
 #include "common/platform_constants.h"
 #include "common/ran_context.h"
 #include "common/utils/T/T.h"
-#include "common/utils/tun_if.h"
+#include "common/utils/tuntap_if.h"
 #include "cuup_cucp_if.h"
 #include "executables/lte-softmodem.h"
 #include "executables/softmodem-common.h"
@@ -405,7 +405,7 @@ void nr_pdcp_layer_init(void)
 
 #include "nfapi/oai_integration/vendor_ext.h"
 #include "executables/lte-softmodem.h"
-#include "common/utils/tun_if.h"
+#include "common/utils/tuntap_if.h"
 #include "openair2/SDAP/nr_sdap/nr_sdap.h"
 
 static void deliver_sdu_drb(void *_ue, nr_pdcp_entity_t *entity,

openair2/RRC/LTE/rrc_UE.c

@@ -64,7 +64,7 @@
 #include "LTE_UECapabilityEnquiry.h"
 #include "LTE_UE-CapabilityRequest.h"
 
-#include "common/utils/tun_if.h"
+#include "common/utils/tuntap_if.h"
 #if ENABLE_RAL
   #include "rrc_UE_ral.h"
 #endif

openair2/RRC/LTE/rrc_eNB.c

@@ -79,7 +79,7 @@
 #include "T.h"
 #include "LTE_MeasResults.h"
 
-#include "common/utils/tun_if.h"
+#include "common/utils/tuntap_if.h"
 
 #include "rrc_eNB_S1AP.h"
 #include "rrc_eNB_GTPV1U.h"

openair2/SDAP/nr_sdap/nr_sdap.c

@@ -29,7 +29,7 @@
 #include "common/utils/LOG/log.h"
 #include "errno.h"
 #include "rlc.h"
-#include "tun_if.h"
+#include "tuntap_if.h"
 #include "system.h"
 
 static void reblock_tun_socket(int fd)

openair2/SDAP/nr_sdap/nr_sdap_entity.c

@@ -31,7 +31,7 @@
 #include "gtpv1_u_messages_types.h"
 #include "intertask_interface.h"
 #include "rlc.h"
-#include "tun_if.h"
+#include "tuntap_if.h"
 #include "nr_sdap.h"
 
 #define NO_SDAP_HEADER 0

openair3/NAS/UE/ESM/esm_ebr_context.c

@@ -45,7 +45,7 @@ Description Defines functions used to handle EPS bearer contexts.
 #include "esm_ebr.h"
 
 #include "esm_ebr_context.h"
-#include "common/utils/tun_if.h"
+#include "common/utils/tuntap_if.h"
 
 #include "emm_sap.h"
 #include "system.h"