diff options
| -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 91e680e..9b8c380 100644 --- a/configure.ac +++ b/configure.ac @@ -457,7 +457,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 f957a10..7075b96 100644 --- a/src/openvpn/syshead.h +++ b/src/openvpn/syshead.h @@ -214,10 +214,6 @@ #ifdef TARGET_LINUX -#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 ba4b15e..9ca3ee2 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1710,9 +1710,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 = π |