Workaround historic linux/netfilter/xt_osf.h deficiencies

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>.

diff --git a/configure.ac b/configure.ac
index 72aaf6a194b3d6098f1626214d1e52af05d2a314..29285dbf083746bf5e257c23c702fec4a93e01b6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/tests/nfnetlink_osf.c b/tests/nfnetlink_osf.c
index 59cf5fb1f10f2bc103c8ed36e6047fb75281a12f..a6dbb7e6c374755fca66592f8675a73100f1f644 100644 (file)
--- a/tests/nfnetlink_osf.c
+++ b/tests/nfnetlink_osf.c
@@ -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>