X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fuml_socket%2Fdevice.c;h=86afc39c85031c73d0b6a6231738f9b8338777c8;hp=18fae95a4aef57498bcd33960da26be0af8f628e;hb=c217d214f4f071c235bc7c463a1da6124e2570a6;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d

diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c
index 18fae95a..86afc39c 100644
--- a/src/uml_socket/device.c
+++ b/src/uml_socket/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- UML network 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
@@ -16,8 +16,6 @@
     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 1374 2004-03-21 14:21:22Z guus $
 */
 
 #include "system.h"
@@ -36,9 +34,9 @@ static int request_fd = -1;
 static int data_fd = -1;
 static int write_fd = -1;
 static int state = 0;
-char *device;
+char *device = NULL;
 char *iface = NULL;
-char *device_info;
+static char *device_info;
 
 extern char *identname;
 extern bool running;
@@ -71,7 +69,7 @@ bool setup_device(void)
 	cp();
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		asprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
+		xasprintf(&device, LOCALSTATEDIR "/run/%s.umlsocket", identname);
 
 	get_config_string(lookup_config(config_tree, "Interface"), &iface);
 
@@ -171,6 +169,9 @@ void close_device(void)
 		close(write_fd);
 
 	unlink(device);
+
+	free(device);
+	if(iface) free(iface);
 }
 
 bool read_packet(vpn_packet_t *packet)