Attachment #402896 for bug #548886

Lines 457-463 Link Here

(-)a/openvpn-2.3.6/configure.ac (-1 / +1 lines)
457	"	457	"
458		458
459	AC_CHECK_HEADERS(	459	AC_CHECK_HEADERS(
460	[net/if.h netinet/ip.h netinet/if_ether.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h],	460	[net/if.h netinet/ip.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h],
461	,	461	,
462	,	462	,
463	[[${SOCKET_INCLUDES}]]	463	[[${SOCKET_INCLUDES}]]

Lines 214-223 Link Here

(-)a/openvpn-2.3.6/src/openvpn/syshead.h (-4 lines)
214		214
215	#ifdef TARGET_LINUX	215	#ifdef TARGET_LINUX
216		216
217	#if defined(HAVE_NETINET_IF_ETHER_H)
218	#include <netinet/if_ether.h>
219	#endif
220
221	#ifdef HAVE_LINUX_IF_TUN_H	217	#ifdef HAVE_LINUX_IF_TUN_H
222	#include <linux/if_tun.h>	218	#include <linux/if_tun.h>
223	#endif	219	#endif

Lines 1710-1718 Link Here

(-)a/openvpn-2.3.6/src/openvpn/tun.c (-2 / +2 lines)
1710	pi.flags = 0;	1710	pi.flags = 0;
1711		1711
1712	if(iph->version == 6)	1712	if(iph->version == 6)
1713	pi.proto = htons(ETH_P_IPV6);	1713	pi.proto = htons(OPENVPN_ETH_P_IPV6);
1714	else	1714	else
1715	pi.proto = htons(ETH_P_IP);	1715	pi.proto = htons(OPENVPN_ETH_P_IPV4);
1716		1716
1717	vect[0].iov_len = sizeof(pi);	1717	vect[0].iov_len = sizeof(pi);
1718	vect[0].iov_base = π	1718	vect[0].iov_base = π

Return to bug 548886