X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsolaris%2Fdevice.c;h=3cafa2388d800be5e418a2dda11460b6a5d5c918;hp=5183721ca7d645bc0e1e2262604913da838af47b;hb=00ddbf5723511d80fbd2522fc503bd409dc6189a;hpb=271d3537fed28b3e76cf0e76082b44c8771ac5da

diff --git a/src/solaris/device.c b/src/solaris/device.c
index 5183721c..3cafa238 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -17,39 +17,27 @@
     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.14 2003/07/12 17:41:48 guus Exp $
+    $Id: device.c,v 1.1.2.15 2003/07/18 13:41:37 guus Exp $
 */
 
 
-#include "config.h"
+#include "system.h"
 
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
 #include <sys/stropts.h>
 #include <sys/sockio.h>
 #include <net/if_tun.h>
 
-#define DEFAULT_DEVICE "/dev/tun"
-
-#include <utils.h>
 #include "conf.h"
-#include "net.h"
 #include "logger.h"
+#include "net.h"
+#include "utils.h"
 
-#include "system.h"
+#define DEFAULT_DEVICE "/dev/tun"
 
 int device_fd = -1;
 int device_type;
 char *device = NULL;
-char *interface = NULL;
+char *iface = NULL;
 char ifrname[IFNAMSIZ];
 char *device_info = NULL;
 
@@ -112,8 +100,8 @@ int setup_device(void)
 		return -1;
 	}
 
-	if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
-		asprintf(&interface, "tun%d", ppa);
+	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
+		asprintf(&iface, "tun%d", ppa);
 
 	device_info = _("Solaris tun device");