Merge branch 'master' of black:tinc

diff --git a/doc/tinc.conf.5.in b/doc/tinc.conf.5.in
index 6853bae4e9af54f9ed4d143c27221eb1576bbf42..746d820f2c20c1ad45ff241c3596447f9d66fded 100644 (file)
--- a/doc/tinc.conf.5.in
+++ b/doc/tinc.conf.5.in
@@ -222,23 +222,23 @@ it can be used to change the way packets are interpreted:
 
 .Bl -tag -width indent
 
-.It tun Pq BSD only
+.It tun Pq BSD and Linux
 Set type to tun.
 Depending on the platform, this can either be with or without an address family header (see below).
 
-.It tunnohead Pq BSD only
+.It tunnohead Pq BSD
 Set type to tun without an address family header.
 Tinc will expect packets read from the virtual network device to start with an IP header.
 On some platforms IPv6 packets cannot be read from or written to the device in this mode.
 
-.It tunifhead Pq BSD only
+.It tunifhead Pq BSD
 Set type to tun with an address family header.
 Tinc will expect packets read from the virtual network device
 to start with a four byte header containing the address family,
 followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.
 
-.It tap Pq BSD only
+.It tap Pq BSD and Linux
 Set type to tap.
 Tinc will expect packets read from the virtual network device
 to start with an Ethernet header.

diff --git a/doc/tinc.texi b/doc/tinc.texi
index 817c2dedcb05872ea31be34a1ad2a397c65c37b4..3bb4407604c46be144621b352f18990343b25cf9 100644 (file)
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -834,25 +834,25 @@ Also, in case tinc does not seem to correctly interpret packets received from th
 it can be used to change the way packets are interpreted:
 
 @table @asis
-@item tun (BSD only)
+@item tun (BSD and Linux)
 Set type to tun.
 Depending on the platform, this can either be with or without an address family header (see below).
 
 @cindex tunnohead
-@item tunnohead (BSD only)
+@item tunnohead (BSD)
 Set type to tun without an address family header.
 Tinc will expect packets read from the virtual network device to start with an IP header.
 On some platforms IPv6 packets cannot be read from or written to the device in this mode.
 
 @cindex tunifhead
-@item tunifhead (BSD only)
+@item tunifhead (BSD)
 Set type to tun with an address family header.
 Tinc will expect packets read from the virtual network device
 to start with a four byte header containing the address family,
 followed by an IP header.
 This mode should support both IPv4 and IPv6 packets.
 
-@item tap (BSD only)
+@item tap (BSD and Linux)
 Set type to tap.
 Tinc will expect packets read from the virtual network device
 to start with an Ethernet header.

diff --git a/src/linux/device.c b/src/linux/device.c
index f50ff1123be023261f23ac52deed8063309f906f..cbf215298dd635e8ff1d2cb869c6d93d114e4862 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);
 }

diff --git a/src/net_setup.c b/src/net_setup.c
index 279feaefd24a7b1c1f21e48cd69dfc0e70597e35..e9a063a50577d90a8b438d11017ba7ba4aee7125 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -540,6 +540,8 @@ static bool setup_myself(void) {
 
        /* Open device */
 
+       devops = os_devops;
+
        if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
                if(!strcasecmp(type, "dummy"))
                        devops = dummy_devops;
@@ -553,12 +555,6 @@ static bool setup_myself(void) {
                else if(!strcasecmp(type, "vde"))
                        devops = vde_devops;
 #endif
-               else {
-                       logger(LOG_ERR, "Unknown device type %s!", type);
-                       return false;
-               }
-       } else {
-               devops = os_devops;
        }
 
        if(!devops.setup())