Merge branch 'master' of black:tinc

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index f50ff11..cbf2152 100644 (file)
--- 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);
 }