From ddb1f20a9ddbb94956c9f7b1115c89543d9b411a Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sat, 16 May 2015 15:59:50 +0200 Subject: [PATCH] Use OPENVPN_ETH_P_* so that is unecessary Fixes compilation error on linux with musl libc because of conflicting ethhdr declarations in and which is included from Signed-off-by: Felix Janda Acked-by: Steffan Karger Message-Id: <20150516134604.GA2302@euler> URL: http://article.gmane.org/gmane.network.openvpn.devel/9690 Signed-off-by: Gert Doering --- configure.ac | 2 +- src/openvpn/syshead.h | 4 ---- src/openvpn/tun.c | 4 ++-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 913246881..5dccfbbc9 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 b898bf2f3..cf29131f2 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 -#endif - #ifdef HAVE_LINUX_IF_TUN_H #include #endif diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 11a6d714c..ce3ed853b 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 = π -- 2.47.2