Commit cdb2f401 authored Aug 13, 2018 by Dmitry V. Levin Committed by Pablo Neira Ayuso Aug 16, 2018

netfilter: uapi: fix linux/netfilter/nf_osf.h userspace compilation errors



Move inclusion of <linux/ip.h> and <linux/tcp.h> from
linux/netfilter/xt_osf.h to linux/netfilter/nf_osf.h to fix
the following linux/netfilter/nf_osf.h userspace compilation errors:

/usr/include/linux/netfilter/nf_osf.h:59:24: error: 'MAX_IPOPTLEN' undeclared here (not in a function)
  struct nf_osf_opt opt[MAX_IPOPTLEN];
/usr/include/linux/netfilter/nf_osf.h:64:17: error: field 'ip' has incomplete type
  struct iphdr   ip;
/usr/include/linux/netfilter/nf_osf.h:65:18: error: field 'tcp' has incomplete type
  struct tcphdr   tcp;

Fixes: bfb15f2a ("netfilter: extract Passive OS fingerprint infrastructure from xt_osf")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 3206c516

include/uapi/linux/netfilter/nfnetlink_osf.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@
		#define _NF_OSF_H

		#include <linux/types.h>
		#include <linux/ip.h>
		#include <linux/tcp.h>

		#define MAXGENRELEN 32

include/uapi/linux/netfilter/xt_osf.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,6 @@
		#define _XT_OSF_H

		#include <linux/types.h>
		#include <linux/ip.h>
		#include <linux/tcp.h>
		#include <linux/netfilter/nfnetlink_osf.h>

		#define XT_OSF_GENRE NF_OSF_GENRE