Remove the test for linux/if_tun.h.

[tinc] / src / linux / device.c

diff --git a/src/linux/device.c b/src/linux/device.c
index 74e3947..3af8df0 100644 (file)
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -1,7 +1,7 @@
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device
 /*
     device.c -- Interaction with Linux ethertap and tun/tap device

-    Copyright (C) 2001-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2001-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2001-2005 Ivo Timmermans,
+                  2001-2006 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
 
     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


@@ -22,16 +22,8 @@
 
 #include "system.h"
 
 
 #include "system.h"
 

-#ifdef HAVE_TUNTAP
-#ifdef LINUX_IF_TUN_H
-#include LINUX_IF_TUN_H
-#else

 #include <linux/if_tun.h>
 #include <linux/if_tun.h>

-#endif

 #define DEFAULT_DEVICE "/dev/net/tun"
 #define DEFAULT_DEVICE "/dev/net/tun"

-#else
-#define DEFAULT_DEVICE "/dev/tap0"
-#endif

 
 #include "conf.h"
 #include "logger.h"
 
 #include "conf.h"
 #include "logger.h"


@@ -46,14 +38,14 @@ typedef enum device_type_t {
 } device_type_t;
 
 int device_fd = -1;
 } device_type_t;
 
 int device_fd = -1;

-device_type_t device_type;
+static device_type_t device_type;

 char *device;
 char *iface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 
 char *device;
 char *iface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 

-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;

 
 bool setup_device(void)
 {
 
 bool setup_device(void)
 {