Get MAC of TAP device.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index f50ff11..8d042d2 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
     Copyright (C) 2001-2005 Ivo Timmermans,
-                  2001-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2001-2014 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "system.h"
+#include "../system.h"
 
 #ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
@@ -27,13 +27,13 @@
 #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 
-#include "conf.h"
-#include "device.h"
-#include "logger.h"
-#include "net.h"
-#include "route.h"
-#include "utils.h"
-#include "xalloc.h"
+#include "../conf.h"
+#include "../device.h"
+#include "../logger.h"
+#include "../net.h"
+#include "../route.h"
+#include "../utils.h"
+#include "../xalloc.h"
 
 typedef enum device_type_t {
        DEVICE_TYPE_ETHERTAP,
@@ -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,11 +81,21 @@ 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)";
        } else {
+               if (routing_mode == RMODE_ROUTER)
+                       overwrite_mac = true;
                ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
                device_type = DEVICE_TYPE_TAP;
                device_info = "Linux tun/tap device (tap mode)";
@@ -96,17 +107,21 @@ static bool setup_device(void) {
                ifr.ifr_flags |= IFF_ONE_QUEUE;
 #endif
 
-       if(iface)
+       if(iface) {
                strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+               ifr.ifr_name[IFNAMSIZ - 1] = 0;
+       }
 
        if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-               if(iface) free(iface);
+               ifrname[IFNAMSIZ - 1] = 0;
+               free(iface);
                iface = xstrdup(ifrname);
        } else if(!ioctl(device_fd, (('T' << 8) | 202), &ifr)) {
                logger(LOG_WARNING, "Old ioctl() request was needed for %s", device);
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-               if(iface) free(iface);
+               ifrname[IFNAMSIZ - 1] = 0;
+               free(iface);
                iface = xstrdup(ifrname);
        } else
 #endif
@@ -115,11 +130,13 @@ static bool setup_device(void) {
                        overwrite_mac = true;
                device_info = "Linux ethertap device";
                device_type = DEVICE_TYPE_ETHERTAP;
-               if(iface)
-                       free(iface);
+               free(iface);
                iface = xstrdup(strrchr(device, '/') ? strrchr(device, '/') + 1 : device);
        }
 
+       if(overwrite_mac && !ioctl(device_fd, SIOCGIFHWADDR, &ifr))
+               memcpy(mymac.x, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+
        logger(LOG_INFO, "%s is a %s", device, device_info);
 
        return true;
@@ -128,6 +145,7 @@ static bool setup_device(void) {
 static void close_device(void) {
        close(device_fd);
 
+       free(type);
        free(device);
        free(iface);
 }
@@ -145,6 +163,7 @@ static bool read_packet(vpn_packet_t *packet) {
                                return false;
                        }
 
+                       memset(packet->data, 0, 12);
                        packet->len = lenin + 10;
                        break;
                case DEVICE_TYPE_TAP:
@@ -200,7 +219,7 @@ static bool write_packet(vpn_packet_t *packet) {
                        }
                        break;
                case DEVICE_TYPE_ETHERTAP:
-                       *(short int *)(packet->data - 2) = packet->len;
+                       memcpy(packet->data - 2, &packet->len, 2);
 
                        if(write(device_fd, packet->data - 2, packet->len + 2) < 0) {
                                logger(LOG_ERR, "Can't write to %s %s: %s", device_info, device,