diff options
| author | Felix Janda <felix.janda@posteo.de> | 2015-05-16 15:59:50 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-05-16 20:40:53 +0200 |
| commit | ddb1f20a9ddbb94956c9f7b1115c89543d9b411a (patch) | |
| tree | 98fd01ca862d347bc8d3205fb89508cfcc01c7af | |
| parent | 2d321609674a916c8cd7bbf0090e0342e90cca36 (diff) | |
| download | openvpn-ddb1f20a9ddbb94956c9f7b1115c89543d9b411a.tar.gz openvpn-ddb1f20a9ddbb94956c9f7b1115c89543d9b411a.tar.xz openvpn-ddb1f20a9ddbb94956c9f7b1115c89543d9b411a.zip | |
Use OPENVPN_ETH_P_* so that <netinet/if_ether.h> is unecessary
Fixes compilation error on linux with musl libc because of
conflicting ethhdr declarations in <netinet/if_ether.h> and
<linux/if_ether.h> which is included from <linux/if_tun.h>
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <20150516134604.GA2302@euler>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9690
Signed-off-by: Gert Doering <gert@greenie.muc.de>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/openvpn/syshead.h | 4 | ||||
| -rw-r--r-- | src/openvpn/tun.c | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 9132468..5dccfbb 100644 --- a/configure.ac +++ b/configure.ac @@ -461,7 +461,7 @@ SOCKET_INCLUDES=" " AC_CHECK_HEADERS( - [net/if.h netinet/ip.h netinet/if_ether.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h], + [net/if.h netinet/ip.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h], , , [[${SOCKET_INCLUDES}]] diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h index b898bf2..cf29131 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -214,10 +214,6 @@ #if defined(TARGET_LINUX) || defined (TARGET_ANDROID) -#if defined(HAVE_NETINET_IF_ETHER_H) -#include <netinet/if_ether.h> -#endif - #ifdef HAVE_LINUX_IF_TUN_H #include <linux/if_tun.h> #endif diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 11a6d71..ce3ed85 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1856,9 +1856,9 @@ write_tun (struct tuntap* tt, uint8_t *buf, int len) pi.flags = 0; if(iph->version == 6) - pi.proto = htons(ETH_P_IPV6); + pi.proto = htons(OPENVPN_ETH_P_IPV6); else - pi.proto = htons(ETH_P_IP); + pi.proto = htons(OPENVPN_ETH_P_IPV4); vect[0].iov_len = sizeof(pi); vect[0].iov_base = π |