From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 12 Jul 2012 09:25:11 +0000 (+0200)
Subject: Use /dev/tap0 by default on FreeBSD and NetBSD when using Mode = switch.
X-Git-Tag: 1.0.19-android-1~9
X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=commitdiff_plain;h=ae8c0b65d8f97942d7eff5f96344f781b8dec35d

Use /dev/tap0 by default on FreeBSD and NetBSD when using Mode = switch.
---

diff --git a/src/bsd/device.c b/src/bsd/device.c
index 45c2d5f..d6dd055 100644
--- a/src/bsd/device.c
+++ b/src/bsd/device.c
@@ -33,7 +33,12 @@
 #include "bsd/tunemu.h"
 #endif
 
-#define DEFAULT_DEVICE "/dev/tun0"
+#define DEFAULT_TUN_DEVICE "/dev/tun0"
+#if defined(HAVE_FREEBSD) || defined(HAVE_NETBSD)
+#define DEFAULT_TAP_DEVICE "/dev/tap0"
+#else
+#define DEFAULT_TAP_DEVICE "/dev/tun0"
+#endif
 
 typedef enum device_type {
 	DEVICE_TYPE_TUN,
@@ -61,8 +66,12 @@ static device_type_t device_type = DEVICE_TYPE_TUN;
 static bool setup_device(void) {
 	char *type;
 
-	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		device = xstrdup(DEFAULT_DEVICE);
+	if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
+		if(routing_mode == RMODE_ROUTER)
+			device = xstrdup(DEFAULT_TUN_DEVICE);
+		else
+			device = xstrdup(DEFAULT_TAP_DEVICE);
+	}
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
 		iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);