glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround historic linux/netfilter/xt_osf.h deficiencies

Browse Source 
When using linux kernel headers without commit v4.5-rc1~128^2~115^2~22
("netfilter: fix include files for compilation"), both <linux/ip.h>
and <linux/tcp.h> have to be included before <linux/netfilter/xt_osf.h>.

* configure.ac (AC_CHECK_HEADERS): Include <linux/ip.h>
and <linux/tcp.h> when checking for linux/netfilter/xt_osf.h header.
* tests/nfnetlink_osf.c: Include <linux/ip.h> and <linux/tcp.h>
before <linux/netfilter/xt_osf.h>.
This commit is contained in:
JingPiao Chen 2017-10-11 22:41:50 +08:00 committed by Dmitry V. Levin
parent 489d8a9564
commit 69c68ef5bf
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -408,7 +408,6 @@ AC_CHECK_HEADERS(m4_normalize([
linux/netfilter/nfnetlink_cttimeout.h
linux/netfilter/nfnetlink_log.h
linux/netfilter/nfnetlink_queue.h
linux/netfilter/xt_osf.h
linux/nsfs.h
linux/perf_event.h
linux/quota.h
@ -443,6 +442,9 @@ AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
AC_CHECK_HEADERS([linux/mqueue.h],,, [#include <linux/types.h>])
AC_CHECK_HEADERS([linux/netfilter/xt_osf.h],,, [#include <linux/ip.h>
#include <linux/tcp.h>])
AC_CHECK_HEADERS(m4_normalize([
linux/netfilter_arp/arp_tables.h
linux/netfilter_bridge/ebtables.h

2
tests/nfnetlink_osf.c
View File

@ -33,6 +33,8 @@
# include <stdio.h>
# include <sys/socket.h>
# include "netlink.h"
# include <linux/ip.h>
# include <linux/tcp.h>
# include <linux/netfilter/nfnetlink.h>
# include <linux/netfilter/xt_osf.h>