From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 16 Dec 2006 16:53:58 +0000 (+0000)
Subject: Do a simple test for linux/if_tun.h instead of no test at all.
X-Git-Tag: release-1.0.6~2
X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=commitdiff_plain;h=855806b2f75fc1c566cfaac01c788cdc625b4687

Do a simple test for linux/if_tun.h instead of no test at all.
---

diff --git a/configure.in b/configure.in
index 181ff8f..3cb6a4d 100644
--- a/configure.in
+++ b/configure.in
@@ -91,7 +91,7 @@ dnl We do this in multiple stages, because unlike Linux all the other operating
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait.h netdb.h arpa/inet.h])
-AC_CHECK_HEADERS([net/if.h net/if_types.h net/if_tun.h net/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
+AC_CHECK_HEADERS([net/if.h net/if_types.h linux/if_tun.h net/if_tun.h net/if_tap.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
   [], [], [#include "have.h"]
 )
 AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
diff --git a/src/linux/device.c b/src/linux/device.c
index 3af8df0..302fa62 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -22,8 +22,12 @@
 
 #include "system.h"
 
+#ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
 #define DEFAULT_DEVICE "/dev/net/tun"
+#else
+#define DEFAULT_DEVICE "/dev/tap0"
+#endif
 
 #include "conf.h"
 #include "logger.h"
@@ -57,7 +61,7 @@ bool setup_device(void)
 		device = DEFAULT_DEVICE;
 
 	if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
-#ifdef HAVE_TUNTAP
+#ifdef HAVE_LINUX_IF_TUN_H
 		iface = netname;
 #else
 		iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
@@ -69,7 +73,7 @@ bool setup_device(void)
 		return false;
 	}
 
-#ifdef HAVE_TUNTAP
+#ifdef HAVE_LINUX_IF_TUN_H
 	/* Ok now check if this is an old ethertap or a new tun/tap thingie */
 
 	memset(&ifr, 0, sizeof(ifr));