X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=cbf215298dd635e8ff1d2cb869c6d93d114e4862;hp=f50ff1123be023261f23ac52deed8063309f906f;hb=d1dcdf8eb6f800704be426b1ce6f6c1a8e65ba0d;hpb=1b2846d907adfc8472fc9da0c951c3243c7ee143

diff --git a/src/linux/device.c b/src/linux/device.c
index f50ff112..cbf21529 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -45,6 +45,7 @@ int device_fd = -1;
 static device_type_t device_type;
 char *device = NULL;
 char *iface = NULL;
+static char *type = NULL;
 static char ifrname[IFNAMSIZ];
 static char *device_info;
 
@@ -80,7 +81,15 @@ static bool setup_device(void) {
 	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
 	memset(&ifr, 0, sizeof(ifr));
-	if(routing_mode == RMODE_ROUTER) {
+
+	get_config_string(lookup_config(config_tree, "DeviceType"), &type);
+
+	if(type && strcasecmp(type, "tun") && strcasecmp(type, "tap")) {
+		logger(LOG_ERR, "Unknown device type %s!", type);
+		return false;
+	}
+
+	if((type && !strcasecmp(type, "tun")) || (!type && routing_mode == RMODE_ROUTER)) {
 		ifr.ifr_flags = IFF_TUN;
 		device_type = DEVICE_TYPE_TUN;
 		device_info = "Linux tun/tap device (tun mode)";
@@ -128,6 +137,7 @@ static bool setup_device(void) {
 static void close_device(void) {
 	close(device_fd);
 
+	free(type);
 	free(device);
 	free(iface);
 }