X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fbsd%2Fdevice.c;h=cb65dbbf307484d1cd9c4dc5fdbe832c1bc3d278;hb=a649aa51bf8e5b5fcc76061c9f660122a08245a8;hp=9bf0cd52850fbb828d89bc83efbdb486e608e6a9;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=tinc

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 9bf0cd52..cb65dbbf 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -19,23 +19,23 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "names.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../names.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
 
 #ifdef ENABLE_TUNEMU
 #include "bsd/tunemu.h"
 #endif
 
 #define DEFAULT_TUN_DEVICE "/dev/tun0"
-#if defined(HAVE_FREEBSD) || defined(HAVE_NETBSD)
+#if defined(HAVE_DARWIN) || defined(HAVE_FREEBSD) || defined(HAVE_NETBSD)
 #define DEFAULT_TAP_DEVICE "/dev/tap0"
 #else
 #define DEFAULT_TAP_DEVICE "/dev/tun0"
@@ -54,8 +54,6 @@ int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
 static char *device_info = NULL;
-static uint64_t device_total_in = 0;
-static uint64_t device_total_out = 0;
 #if defined(ENABLE_TUNEMU)
 static device_type_t device_type = DEVICE_TYPE_TUNEMU;
 #elif defined(HAVE_OPENBSD) || defined(HAVE_FREEBSD) || defined(HAVE_DRAGONFLY)
@@ -75,6 +73,15 @@ static bool setup_device(void) {
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+		iface = NULL;
+#ifndef TAPGIFNAME
+	if (iface) {
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Ignoring specified interface name '%s' as device rename is not supported on this platform", iface);
+		free(iface);
+		iface = NULL;
+	}
+#endif
+	if (!iface)
 		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
 
 	if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
@@ -199,9 +206,11 @@ static void close_device(void) {
 		default:
 			close(device_fd);
 	}
+	device_fd = -1;
 
-	free(device);
-	free(iface);
+	free(device); device = NULL;
+	free(iface); iface = NULL;
+	device_info = NULL;
 }
 
 static bool read_packet(vpn_packet_t *packet) {
@@ -290,8 +299,6 @@ static bool read_packet(vpn_packet_t *packet) {
 			return false;
 	}
 
-	device_total_in += packet->len;
-
 	logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s",
 			   packet->len, device_info);
 
@@ -362,21 +369,12 @@ static bool write_packet(vpn_packet_t *packet) {
 			return false;
 	}
 
-	device_total_out += packet->len;
-
 	return true;
 }
 
-static void dump_device_stats(void) {
-	logger(DEBUG_ALWAYS, LOG_DEBUG, "Statistics for %s %s:", device_info, device);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes in:  %10"PRIu64, device_total_in);
-	logger(DEBUG_ALWAYS, LOG_DEBUG, " total bytes out: %10"PRIu64, device_total_out);
-}
-
 const devops_t os_devops = {
 	.setup = setup_device,
 	.close = close_device,
 	.read = read_packet,
 	.write = write_packet,
-	.dump_stats = dump_device_stats,
 };