Merge branch 'master' into 1.1

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 75e7715..e692ca9 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 <ivo@tinc-vpn.org>,
-                  2001-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2001-2005 Ivo Timmermans,
+                  2001-2009 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
@@ -22,12 +22,8 @@
 
 #include "system.h"
 
-#ifdef HAVE_TUNTAP
-#ifdef LINUX_IF_TUN_H
-#include LINUX_IF_TUN_H
-#else
+#ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
-#endif
 #define DEFAULT_DEVICE "/dev/net/tun"
 #else
 #define DEFAULT_DEVICE "/dev/tap0"
@@ -38,6 +34,7 @@
 #include "net.h"
 #include "route.h"
 #include "utils.h"
+#include "xalloc.h"
 
 typedef enum device_type_t {
        DEVICE_TYPE_ETHERTAP,
@@ -47,28 +44,28 @@ typedef enum device_type_t {
 
 int device_fd = -1;
 static device_type_t device_type;
-char *device;
-char *iface;
-char ifrname[IFNAMSIZ];
-char *device_info;
+char *device = NULL;
+char *iface = NULL;
+static char ifrname[IFNAMSIZ];
+static char *device_info;
 
 static int device_total_in = 0;
 static int device_total_out = 0;
 
-bool setup_device(void)
-{
+bool setup_device(void) {
        struct ifreq ifr;
 
        cp();
 
        if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-               device = DEFAULT_DEVICE;
+               device = xstrdup(DEFAULT_DEVICE);
 
        if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_TUNTAP
-               iface = netname;
+#ifdef HAVE_LINUX_IF_TUN_H
+               if (netname != NULL)
+                       iface = xstrdup(netname);
 #else
-               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+               iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
 #endif
        device_fd = open(device, O_RDWR | O_NONBLOCK);
 
@@ -77,10 +74,10 @@ bool setup_device(void)
                return false;
        }
 
-#ifdef HAVE_TUNTAP
+#ifdef HAVE_LINUX_IF_TUN_H
        /* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
-       memset(&ifr, 0, sizeof(ifr));
+       memset(&ifr, 0, sizeof ifr);
        if(routing_mode == RMODE_ROUTER) {
                ifr.ifr_flags = IFF_TUN;
                device_type = DEVICE_TYPE_TUN;
@@ -96,11 +93,13 @@ bool setup_device(void)
 
        if(!ioctl(device_fd, TUNSETIFF, &ifr)) {
                strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-               iface = ifrname;
+               if(iface) 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);
-               iface = ifrname;
+               if(iface) free(iface);
+               iface = xstrdup(ifrname);
        } else
 #endif
        {
@@ -108,7 +107,9 @@ bool setup_device(void)
                        overwrite_mac = true;
                device_info = _("Linux ethertap device");
                device_type = DEVICE_TYPE_ETHERTAP;
-               iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+               if(iface)
+                       free(iface);
+               iface = xstrdup(rindex(device, '/') ? rindex(device, '/') + 1 : device);
        }
 
        logger(LOG_INFO, _("%s is a %s"), device, device_info);
@@ -116,52 +117,53 @@ bool setup_device(void)
        return true;
 }
 
-void close_device(void)
-{
+void close_device(void) {
        cp();
        
        close(device_fd);
+
+       free(device);
+       free(iface);
 }
 
-bool read_packet(vpn_packet_t *packet)
-{
-       int lenin;
+bool read_packet(vpn_packet_t *packet) {
+       int inlen;
        
        cp();
 
        switch(device_type) {
                case DEVICE_TYPE_TUN:
-                       lenin = read(device_fd, packet->data + 10, MTU - 10);
+                       inlen = read(device_fd, packet->data + 10, MTU - 10);
 
-                       if(lenin <= 0) {
+                       if(inlen <= 0) {
                                logger(LOG_ERR, _("Error while reading from %s %s: %s"),
                                           device_info, device, strerror(errno));
                                return false;
                        }
 
-                       packet->len = lenin + 10;
+                       packet->len = inlen + 10;
                        break;
                case DEVICE_TYPE_TAP:
-                       lenin = read(device_fd, packet->data, MTU);
+                       inlen = read(device_fd, packet->data, MTU);
 
-                       if(lenin <= 0) {
+                       if(inlen <= 0) {
                                logger(LOG_ERR, _("Error while reading from %s %s: %s"),
                                           device_info, device, strerror(errno));
                                return false;
                        }
 
-                       packet->len = lenin;
+                       packet->len = inlen;
                        break;
                case DEVICE_TYPE_ETHERTAP:
-                       lenin = read(device_fd, packet->data - 2, MTU + 2);
+                       inlen = read(device_fd, packet->data - 2, MTU + 2);
 
-                       if(lenin <= 0) {
+                       if(inlen <= 0) {
                                logger(LOG_ERR, _("Error while reading from %s %s: %s"),
                                           device_info, device, strerror(errno));
                                return false;
                        }
 
-                       packet->len = lenin - 2;
+                       packet->len = inlen - 2;
                        break;
        }
 
@@ -173,8 +175,7 @@ bool read_packet(vpn_packet_t *packet)
        return true;
 }
 
-bool write_packet(vpn_packet_t *packet)
-{
+bool write_packet(vpn_packet_t *packet) {
        cp();
 
        ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
@@ -212,8 +213,7 @@ bool write_packet(vpn_packet_t *packet)
        return true;
 }
 
-void dump_device_stats(void)
-{
+void dump_device_stats(void) {
        cp();
 
        logger(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);