X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Flinux%2Fdevice.c;h=caee25487c4206b0a3395629be525f25f72dfb41;hp=f9105e655f26b1a580d777171f65a56182901142;hb=00ddbf5723511d80fbd2522fc503bd409dc6189a;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a

diff --git a/src/linux/device.c b/src/linux/device.c
index f9105e65..caee2548 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -17,20 +17,10 @@
     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.17 2003/07/12 17:41:48 guus Exp $
+    $Id: device.c,v 1.1.2.19 2003/07/18 13:41:36 guus Exp $
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/ioctl.h>
+#include "system.h"
 
 #ifdef HAVE_TUNTAP
 #ifdef LINUX_IF_TUN_H
@@ -43,13 +33,11 @@
 #define DEFAULT_DEVICE "/dev/tap0"
 #endif
 
-#include <utils.h>
 #include "conf.h"
+#include "logger.h"
 #include "net.h"
 #include "route.h"
-#include "logger.h"
-
-#include "system.h"
+#include "utils.h"
 
 enum {
 	DEVICE_TYPE_ETHERTAP,
@@ -60,7 +48,7 @@ enum {
 int device_fd = -1;
 int device_type;
 char *device;
-char *interface;
+char *iface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 
@@ -76,11 +64,11 @@ int setup_device(void)
 	if(!get_config_string(lookup_config(config_tree, "Device"), &device))
 		device = DEFAULT_DEVICE;
 
-	if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
+	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
 #ifdef HAVE_TUNTAP
-		interface = netname;
+		iface = netname;
 #else
-		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 #endif
 	device_fd = open(device, O_RDWR | O_NONBLOCK);
 
@@ -103,16 +91,16 @@ int setup_device(void)
 		device_info = _("Linux tun/tap device (tap mode)");
 	}
 
-	if(interface)
-		strncpy(ifr.ifr_name, interface, IFNAMSIZ);
+	if(iface)
+		strncpy(ifr.ifr_name, iface, IFNAMSIZ);
 
 	if(!ioctl(device_fd, TUNSETIFF, (void *) &ifr)) {
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-		interface = ifrname;
+		iface = ifrname;
 	} else if(!ioctl(device_fd, (('T' << 8) | 202), (void *) &ifr)) {
 		logger(LOG_WARNING, _("Old ioctl() request was needed for %s"), device);
 		strncpy(ifrname, ifr.ifr_name, IFNAMSIZ);
-		interface = ifrname;
+		iface = ifrname;
 	} else
 #endif
 	{
@@ -120,7 +108,7 @@ int setup_device(void)
 			overwrite_mac = 1;
 		device_info = _("Linux ethertap device");
 		device_type = DEVICE_TYPE_ETHERTAP;
-		interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
+		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
 	}
 
 	logger(LOG_INFO, _("%s is a %s"), device, device_info);