X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fraw_socket%2Fdevice.c;h=f2a135d3de57bea591b83d94447660d0db6a5caf;hp=b1995eb80ca93c7ea8384b512efc57f9ea7a37df;hb=78fc59e994c764d072bf0045177f690a378d1308;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d

diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index b1995eb8..f2a135d3 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- raw socket
-    Copyright (C) 2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2002-2005 Guus Sliepen <guus@tinc-vpn.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
@@ -29,12 +29,13 @@
 #include "logger.h"
 #include "utils.h"
 #include "route.h"
+#include "xalloc.h"
 
 int device_fd = -1;
-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;
@@ -46,12 +47,11 @@ bool setup_device(void)
 
 	cp();
 
-	if(!get_config_string
-		  (lookup_config(config_tree, "Interface"), &iface))
-		iface = "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 = iface;
+		device = xstrdup(iface);
 
 	device_info = _("raw socket");
 
@@ -90,6 +90,9 @@ void close_device(void)
 	cp();
 
 	close(device_fd);
+
+	free(device);
+	free(iface);
 }
 
 bool read_packet(vpn_packet_t *packet)