X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=802a186157f6abd063bcc7d4d2bca5e3715afc3c;hp=3af8df09dc483c4cce869c9db0755d4d0555e639;hb=c217d214f4f071c235bc7c463a1da6124e2570a6;hpb=0322c0883b76257c0893aa75a510e264056ac15b

diff --git a/src/linux/device.c b/src/linux/device.c
index 3af8df09..802a1861 100644
--- 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-2006 Guus Sliepen <guus@tinc-vpn.org>
+                  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
@@ -16,20 +16,23 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
 */
 
 #include "system.h"
 
+#ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
 #define DEFAULT_DEVICE "/dev/net/tun"
+#else
+#define DEFAULT_DEVICE "/dev/tap0"
+#endif
 
 #include "conf.h"
 #include "logger.h"
 #include "net.h"
 #include "route.h"
 #include "utils.h"
+#include "xalloc.h"
 
 typedef enum device_type_t {
 	DEVICE_TYPE_ETHERTAP,
@@ -39,10 +42,10 @@ 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;
@@ -54,13 +57,14 @@ bool setup_device(void)
 	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);
 
@@ -69,7 +73,7 @@ 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));
@@ -88,11 +92,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
 	{
@@ -100,7 +106,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);
@@ -113,6 +121,9 @@ void close_device(void)
 	cp();
 	
 	close(device_fd);
+
+	free(device);
+	free(iface);
 }
 
 bool read_packet(vpn_packet_t *packet)