X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=6c56ed647cf0d0c576652e8a449952b2966a867d;hp=1bece597577c629a1fd057e6d6330d6f3fceb328;hb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee;hpb=8eca27e863d9cb139a1e4039f63aaac3c9afc3c6

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 1bece597..6c56ed64 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
-    Copyright (C) 2002-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2002-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2002-2005 Ivo Timmermans,
+                  2002-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
@@ -13,43 +13,30 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    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: device.c,v 1.1.2.9 2003/07/31 11:31:51 guus Exp $
+    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.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
+#include "system.h"
+
 #include <netpacket/packet.h>
-#include <net/ethernet.h>
 
-#include <utils.h>
 #include "conf.h"
 #include "net.h"
 #include "logger.h"
-
-#include "system.h"
+#include "utils.h"
+#include "route.h"
+#include "xalloc.h"
 
 int device_fd = -1;
-char *device;
-char *interface;
-char ifrname[IFNAMSIZ];
-char *device_info;
+char *device = NULL;
+char *iface = NULL;
+static char ifrname[IFNAMSIZ];
+static char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
@@ -58,12 +45,11 @@ bool setup_device(void)
 
 	cp();
 
-	if(!get_config_string
-		  (lookup_config(config_tree, "Interface"), &interface))
-		interface = "eth0";
+	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+		iface = xstrdup("eth0");
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		device = interface;
+		device = xstrdup(iface);
 
 	device_info = _("raw socket");
 
@@ -74,10 +60,10 @@ bool setup_device(void)
 	}
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_ifrn.ifrn_name, interface, IFNAMSIZ);
+	strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
 	if(ioctl(device_fd, SIOCGIFINDEX, &ifr)) {
 		close(device_fd);
-		logger(LOG_ERR, _("Can't find interface %s: %s"), interface,
+		logger(LOG_ERR, _("Can't find interface %s: %s"), iface,
 			   strerror(errno));
 		return false;
 	}
@@ -88,7 +74,7 @@ bool setup_device(void)
 	sa.sll_ifindex = ifr.ifr_ifindex;
 
 	if(bind(device_fd, (struct sockaddr *) &sa, (socklen_t) sizeof(sa))) {
-		logger(LOG_ERR, _("Could not bind to %s: %s"), device, strerror(errno));
+		logger(LOG_ERR, _("Could not bind %s to %s: %s"), device, iface, strerror(errno));
 		return false;
 	}
 
@@ -102,6 +88,9 @@ void close_device(void)
 	cp();
 
 	close(device_fd);
+
+	free(device);
+	free(iface);
 }
 
 bool read_packet(vpn_packet_t *packet)