j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Guus Sliepen 2006-12-16 16:53:58 +00:00
parent 0322c0883b
commit 855806b2f7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -91,7 +91,7 @@ dnl We do this in multiple stages, because unlike Linux all the other operating
AC_HEADER_STDC 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([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"] [], [], [#include "have.h"]
) )
AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h], AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],

8
src/linux/device.c
View file

@ -22,8 +22,12 @@
#include "system.h" #include "system.h"
#ifdef HAVE_LINUX_IF_TUN_H
#include <linux/if_tun.h> #include <linux/if_tun.h>
#define DEFAULT_DEVICE "/dev/net/tun" #define DEFAULT_DEVICE "/dev/net/tun"
#else
#define DEFAULT_DEVICE "/dev/tap0"
#endif
#include "conf.h" #include "conf.h"
#include "logger.h" #include "logger.h"
@ -57,7 +61,7 @@ bool setup_device(void)
device = DEFAULT_DEVICE; device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &iface)) if(!get_config_string(lookup_config(config_tree, "Interface"), &iface))
#ifdef HAVE_TUNTAP #ifdef HAVE_LINUX_IF_TUN_H
iface = netname; iface = netname;
#else #else
iface = rindex(device, '/') ? rindex(device, '/') + 1 : device; iface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
@ -69,7 +73,7 @@ bool setup_device(void)
return false; 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 */ /* Ok now check if this is an old ethertap or a new tun/tap thingie */
memset(&ifr, 0, sizeof(ifr)); memset(&ifr, 0, sizeof(ifr));