From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 5 Jun 2017 13:59:56 +0000 (+0000)
Subject: tests: guard against missing linux/netfilter/nfnetlink.h
X-Git-Tag: v4.18~105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=909ffde2d6143ffc1578df7651ded0d797d72876;p=strace

tests: guard against missing linux/netfilter/nfnetlink.h

nfnetlink was introduced in linux by commit v2.6.14-rc1~1035^2~217,
add a guard for the case when system headers are not fresh enough.

* configure.ac (AC_CHECK_HEADERS): Add linux/netfilter/nfnetlink.h.
* tests/netlink_netfilter.c: Check for HAVE_LINUX_NETFILTER_NFNETLINK_H.
---

diff --git a/configure.ac b/configure.ac
index 0d4679e1..dc49d397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,6 +371,7 @@ AC_CHECK_HEADERS(m4_normalize([
 	linux/ipc.h
 	linux/mmtimer.h
 	linux/msg.h
+	linux/netfilter/nfnetlink.h
 	linux/nsfs.h
 	linux/perf_event.h
 	linux/quota.h
diff --git a/tests/netlink_netfilter.c b/tests/netlink_netfilter.c
index 811585a5..103ae95f 100644
--- a/tests/netlink_netfilter.c
+++ b/tests/netlink_netfilter.c
@@ -26,12 +26,15 @@
  */
 
 #include "tests.h"
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <linux/netfilter/nfnetlink.h>
-#include <linux/netlink.h>
+
+#ifdef HAVE_LINUX_NETFILTER_NFNETLINK_H
+
+# include <stdio.h>
+# include <string.h>
+# include <unistd.h>
+# include <sys/socket.h>
+# include <linux/netfilter/nfnetlink.h>
+# include <linux/netlink.h>
 
 static void
 test_nlmsg_type(const int fd)
@@ -42,7 +45,7 @@ test_nlmsg_type(const int fd)
 		.nlmsg_flags = NLM_F_REQUEST,
 	};
 
-#ifdef NFNL_MSG_BATCH_BEGIN
+# ifdef NFNL_MSG_BATCH_BEGIN
 	nlh.nlmsg_type = NFNL_MSG_BATCH_BEGIN;
 	rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0);
 	printf("sendto(%d, {{len=%u, type=NFNL_MSG_BATCH_BEGIN"
@@ -57,7 +60,7 @@ test_nlmsg_type(const int fd)
 	       ", %u, MSG_DONTWAIT, NULL, 0) = %s\n",
 	       fd, nlh.nlmsg_len, NFNL_MSG_BATCH_BEGIN,
 	       (unsigned) sizeof(nlh), sprintrc(rc));
-#endif
+# endif
 
 	nlh.nlmsg_type = (NFNL_SUBSYS_CTNETLINK << 8);
 	rc = sendto(fd, &nlh, sizeof(nlh), MSG_DONTWAIT, NULL, 0);
@@ -79,3 +82,9 @@ int main(void)
 
 	return 0;
 }
+
+#else
+
+SKIP_MAIN_UNDEFINED("HAVE_LINUX_NETFILTER_NFNETLINK_H")
+
+#endif