X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=f76bbbd5feeb4c87db1543d64497c52eb142661a;hp=9c2a762a65ccb570f5eff47cb483249340119ef4;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=de78d79db84c486afcc353884ec1770866beb653

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 9c2a762a..f76bbbd5 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Solaris tun 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
@@ -31,13 +31,14 @@
 #include "logger.h"
 #include "net.h"
 #include "utils.h"
+#include "xalloc.h"
 
 #define DEFAULT_DEVICE "/dev/tun"
 
 int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
-char *device_info = NULL;
+static char *device_info = NULL;
 
 static int device_total_in = 0;
 static int device_total_out = 0;
@@ -51,7 +52,7 @@ bool setup_device(void)
 	cp();
 
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
-		device = DEFAULT_DEVICE;
+		device = xstrdup(DEFAULT_DEVICE);
 
 	if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
 		logger(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
@@ -99,7 +100,7 @@ bool setup_device(void)
 	}
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-		asprintf(&iface, "tun%d", ppa);
+		xasprintf(&iface, "tun%d", ppa);
 
 	device_info = _("Solaris tun device");
 
@@ -113,6 +114,9 @@ void close_device(void)
 	cp();
 
 	close(device_fd);
+
+	free(device);
+	free(iface);
 }
 
 bool read_packet(vpn_packet_t *packet)