Fix "use of GNU empty initializer extension" warning.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index cfd99ff..2c40ead 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-2013 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
@@ -44,15 +44,17 @@ char *device = NULL;
 char *iface = NULL;
 static char *type = NULL;
 static char ifrname[IFNAMSIZ];
-static char *device_info;
+static const char *device_info;
 
 static bool setup_device(void) {
-       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+       if(!get_config_string(lookup_config(config_tree, "Device"), &device)) {
                device = xstrdup(DEFAULT_DEVICE);
+       }
 
        if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-               if(netname)
+               if(netname) {
                        iface = xstrdup(netname);
+               }
 
        device_fd = open(device, O_RDWR | O_NONBLOCK);
 
@@ -79,8 +81,10 @@ static bool setup_device(void) {
                device_type = DEVICE_TYPE_TUN;
                device_info = "Linux tun/tap device (tun mode)";
        } else {
-               if (routing_mode == RMODE_ROUTER)
+               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)";
@@ -90,21 +94,38 @@ static bool setup_device(void) {
        /* Set IFF_ONE_QUEUE flag... */
 
        bool t1q = false;
-       if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q)
+
+       if(get_config_bool(lookup_config(config_tree, "IffOneQueue"), &t1q) && t1q) {
                ifr.ifr_flags |= IFF_ONE_QUEUE;
+       }
+
 #endif
 
-       if(iface)
+       if(iface) {
                strncpy(ifr.ifr_name, iface, IFNAMSIZ);
+       }
 
        if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
                free(iface);
                iface = xstrdup(ifrname);
+       } else {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not create a tun/tap interface from %s: %s", device, strerror(errno));
+               return false;
        }
 
        logger(DEBUG_ALWAYS, LOG_INFO, "%s is a %s", device, device_info);
 
+       if(ifr.ifr_flags & IFF_TAP) {
+               struct ifreq ifr_mac = {{{0}}};
+
+               if(!ioctl(device_fd, SIOCGIFHWADDR, &ifr_mac)) {
+                       memcpy(mymac.x, ifr_mac.ifr_hwaddr.sa_data, ETH_ALEN);
+               } else {
+                       logger(DEBUG_ALWAYS, LOG_WARNING, "Could not get MAC address of %s: %s", device, strerror(errno));
+               }
+       }
+
        return true;
 }
 
@@ -112,9 +133,12 @@ static void close_device(void) {
        close(device_fd);
        device_fd = -1;
 
-       free(type); type = NULL;
-       free(device); device = NULL;
-       free(iface); iface = NULL;
+       free(type);
+       type = NULL;
+       free(device);
+       device = NULL;
+       free(iface);
+       iface = NULL;
        device_info = NULL;
 }
 
@@ -122,61 +146,73 @@ static bool read_packet(vpn_packet_t *packet) {
        int inlen;
 
        switch(device_type) {
-               case DEVICE_TYPE_TUN:
-                       inlen = read(device_fd, packet->data + 10, MTU - 10);
+       case DEVICE_TYPE_TUN:
+               inlen = read(device_fd, DATA(packet) + 10, MTU - 10);
+
+               if(inlen <= 0) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s",
+                              device_info, device, strerror(errno));
 
-                       if(inlen <= 0) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s",
-                                          device_info, device, strerror(errno));
-                               return false;
+                       if(errno == EBADFD) {  /* File descriptor in bad state */
+                               event_exit();
                        }
 
-                       memset(packet->data, 0, 12);
-                       packet->len = inlen + 10;
-                       break;
-               case DEVICE_TYPE_TAP:
-                       inlen = read(device_fd, packet->data, MTU);
+                       return false;
+               }
 
-                       if(inlen <= 0) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s",
-                                          device_info, device, strerror(errno));
-                               return false;
-                       }
+               memset(DATA(packet), 0, 12);
+               packet->len = inlen + 10;
+               break;
+
+       case DEVICE_TYPE_TAP:
+               inlen = read(device_fd, DATA(packet), MTU);
+
+               if(inlen <= 0) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Error while reading from %s %s: %s",
+                              device_info, device, strerror(errno));
+                       return false;
+               }
 
-                       packet->len = inlen;
-                       break;
-               default:
-                       abort();
+               packet->len = inlen;
+               break;
+
+       default:
+               abort();
        }
 
        logger(DEBUG_TRAFFIC, LOG_DEBUG, "Read packet of %d bytes from %s", packet->len,
-                          device_info);
+              device_info);
 
        return true;
 }
 
 static bool write_packet(vpn_packet_t *packet) {
        logger(DEBUG_TRAFFIC, LOG_DEBUG, "Writing packet of %d bytes to %s",
-                          packet->len, device_info);
+              packet->len, device_info);
 
        switch(device_type) {
-               case DEVICE_TYPE_TUN:
-                       packet->data[10] = packet->data[11] = 0;
-                       if(write(device_fd, packet->data + 10, packet->len - 10) < 0) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
-                                          strerror(errno));
-                               return false;
-                       }
-                       break;
-               case DEVICE_TYPE_TAP:
-                       if(write(device_fd, packet->data, packet->len) < 0) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
-                                          strerror(errno));
-                               return false;
-                       }
-                       break;
-               default:
-                       abort();
+       case DEVICE_TYPE_TUN:
+               DATA(packet)[10] = DATA(packet)[11] = 0;
+
+               if(write(device_fd, DATA(packet) + 10, packet->len - 10) < 0) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
+                              strerror(errno));
+                       return false;
+               }
+
+               break;
+
+       case DEVICE_TYPE_TAP:
+               if(write(device_fd, DATA(packet), packet->len) < 0) {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Can't write to %s %s: %s", device_info, device,
+                              strerror(errno));
+                       return false;
+               }
+
+               break;
+
+       default:
+               abort();
        }
 
        return true;