mirrors/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-11-24 02:03:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up: Presume that Linux is always IPv6 capable at build time

Browse Source 
These days it is highly unlikely that OpenVPN will be built in a non-IPv6
capable Linux environment.  So remove compile-time related macros identifying
that.

This also solves an issue which was introduced in commit 51bd56f46f
where HAVE_TUN_PI is no longer detected.  The tun_pi struct is defined in
linux/if_tun.h, which will be checked for later on.  As this struct has history
in linux/if_tun.h all back to the beginning of the kernel git tree (2.6.12-rc2,
April 2005), it is considered not needed to check for this struct explicit.

[ v2: Commit 7c0a2b5f2b modifies some of the checks this patch touches.  This
      patch just adopts to those changes ]

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Alon Bar-Lev <alon.barlev@gmail.com>
Message-Id: 1335521425-23391-1-git-send-email-davids@redhat.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/6351
This commit is contained in:
David Sommerseth 2012-04-27 12:10:25 +02:00
parent f99d8fa79d
commit bff413d5c4
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -414,12 +414,6 @@ AC_CHECK_TYPES(
[AC_DEFINE([in_addr_t], [uint32_t], [Workaround missing in_addr_t])], [AC_DEFINE([in_addr_t], [uint32_t], [Workaround missing in_addr_t])],
[[${SOCKET_INCLUDES}]] [[${SOCKET_INCLUDES}]]
) )
AC_CHECK_TYPE(
[struct tun_pi],
[AC_DEFINE([HAVE_TUN_PI], [1], [struct tun_pi needed for IPv6 support])],
,
[[${SOCKET_INCLUDES}]]
)
AC_CHECK_TYPE( AC_CHECK_TYPE(
[struct iphdr], [struct iphdr],
[AC_DEFINE([HAVE_IPHDR], [1], [struct iphdr needed for IPv6 support])], [AC_DEFINE([HAVE_IPHDR], [1], [struct iphdr needed for IPv6 support])],

19
src/openvpn/tun.c
View File

@ -1373,14 +1373,6 @@ close_tun_generic (struct tuntap *tt)
#error header file linux/sockios.h required #error header file linux/sockios.h required
#endif #endif
#if defined(HAVE_TUN_PI) && defined(HAVE_IPHDR) && defined(HAVE_IOVEC) && defined(ETH_P_IPV6) && defined(ETH_P_IP) && defined(HAVE_READV) && defined(HAVE_WRITEV)
#define LINUX_IPV6 1
/* #warning IPv6 ON */
#else
#define LINUX_IPV6 0
/* #warning IPv6 OFF */
#endif
#if !PEDANTIC #if !PEDANTIC
void void
@ -1388,13 +1380,6 @@ open_tun (const char *dev, const char *dev_type, const char *dev_node, struct tu
{ {
struct ifreq ifr; struct ifreq ifr;
/* warn if a very old linux version is used & --tun-ipv6 set
*/
#if LINUX_IPV6 == 0
if ( tt->ipv6 )
msg (M_WARN, "NOTE: explicit support for IPv6 tun devices is not provided for this OS");
#endif
/* /*
* We handle --dev null specially, we do not open /dev/null for this. * We handle --dev null specially, we do not open /dev/null for this.
*/ */
@ -1623,7 +1608,6 @@ close_tun (struct tuntap *tt)
int int
write_tun (struct tuntap* tt, uint8_t *buf, int len) write_tun (struct tuntap* tt, uint8_t *buf, int len)
{ {
#if LINUX_IPV6
if (tt->ipv6) if (tt->ipv6)
{ {
struct tun_pi pi; struct tun_pi pi;
@ -1649,14 +1633,12 @@ write_tun (struct tuntap* tt, uint8_t *buf, int len)
return(ret - sizeof(pi)); return(ret - sizeof(pi));
} }
else else
#endif
return write (tt->fd, buf, len); return write (tt->fd, buf, len);
} }
int int
read_tun (struct tuntap* tt, uint8_t *buf, int len) read_tun (struct tuntap* tt, uint8_t *buf, int len)
{ {
#if LINUX_IPV6
if (tt->ipv6) if (tt->ipv6)
{ {
struct iovec vect[2]; struct iovec vect[2];
@ -1672,7 +1654,6 @@ read_tun (struct tuntap* tt, uint8_t *buf, int len)
return(ret - sizeof(pi)); return(ret - sizeof(pi));
} }
else else
#endif
return read (tt->fd, buf, len); return read (tt->fd, buf, len);
} }