tinc/src/solaris device.c,1.1.2.14,1.1.2.15

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src/solaris
In directory humbolt:/tmp/cvs-serv19621/solaris

Modified Files:
      Tag: CABAL
	device.c 
Log Message:
Update all device.c files.


Index: device.c
===================================================================
RCS file: /home/CVS/tinc/src/solaris/device.c,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- device.c	2003/07/12 17:41:48	1.1.2.14
+++ device.c	2003/07/18 13:41:37	1.1.2.15
@@ -21,35 +21,23 @@
 */
 
 
-#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 @@
 		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");
 

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/