|
@@ -248,6 +248,7 @@ struct ltchars {
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/mount.h>
|
|
|
#include <linux/netfilter/nfnetlink.h>
|
|
|
+#include <linux/netfilter/nf_tables.h>
|
|
|
#include <linux/netlink.h>
|
|
|
#include <linux/net_namespace.h>
|
|
|
#include <linux/nfc.h>
|
|
@@ -283,10 +284,6 @@ struct ltchars {
|
|
|
#include <asm/termbits.h>
|
|
|
#endif
|
|
|
|
|
|
-#ifndef MSG_FASTOPEN
|
|
|
-#define MSG_FASTOPEN 0x20000000
|
|
|
-#endif
|
|
|
-
|
|
|
#ifndef PTRACE_GETREGS
|
|
|
#define PTRACE_GETREGS 0xc
|
|
|
#endif
|
|
@@ -295,14 +292,6 @@ struct ltchars {
|
|
|
#define PTRACE_SETREGS 0xd
|
|
|
#endif
|
|
|
|
|
|
-#ifndef SOL_NETLINK
|
|
|
-#define SOL_NETLINK 270
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifndef SOL_SMC
|
|
|
-#define SOL_SMC 286
|
|
|
-#endif
|
|
|
-
|
|
|
#ifdef SOL_BLUETOOTH
|
|
|
// SPARC includes this in /usr/include/sparc64-linux-gnu/bits/socket.h
|
|
|
// but it is already in bluetooth_linux.go
|
|
@@ -319,10 +308,23 @@ struct ltchars {
|
|
|
#undef TIPC_WAIT_FOREVER
|
|
|
#define TIPC_WAIT_FOREVER 0xffffffff
|
|
|
|
|
|
-// Copied from linux/l2tp.h
|
|
|
-// Including linux/l2tp.h here causes conflicts between linux/in.h
|
|
|
-// and netinet/in.h included via net/route.h above.
|
|
|
-#define IPPROTO_L2TP 115
|
|
|
+// Copied from linux/netfilter/nf_nat.h
|
|
|
+// Including linux/netfilter/nf_nat.h here causes conflicts between linux/in.h
|
|
|
+// and netinet/in.h.
|
|
|
+#define NF_NAT_RANGE_MAP_IPS (1 << 0)
|
|
|
+#define NF_NAT_RANGE_PROTO_SPECIFIED (1 << 1)
|
|
|
+#define NF_NAT_RANGE_PROTO_RANDOM (1 << 2)
|
|
|
+#define NF_NAT_RANGE_PERSISTENT (1 << 3)
|
|
|
+#define NF_NAT_RANGE_PROTO_RANDOM_FULLY (1 << 4)
|
|
|
+#define NF_NAT_RANGE_PROTO_OFFSET (1 << 5)
|
|
|
+#define NF_NAT_RANGE_NETMAP (1 << 6)
|
|
|
+#define NF_NAT_RANGE_PROTO_RANDOM_ALL \
|
|
|
+ (NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PROTO_RANDOM_FULLY)
|
|
|
+#define NF_NAT_RANGE_MASK \
|
|
|
+ (NF_NAT_RANGE_MAP_IPS | NF_NAT_RANGE_PROTO_SPECIFIED | \
|
|
|
+ NF_NAT_RANGE_PROTO_RANDOM | NF_NAT_RANGE_PERSISTENT | \
|
|
|
+ NF_NAT_RANGE_PROTO_RANDOM_FULLY | NF_NAT_RANGE_PROTO_OFFSET | \
|
|
|
+ NF_NAT_RANGE_NETMAP)
|
|
|
|
|
|
// Copied from linux/hid.h.
|
|
|
// Keep in sync with the size of the referenced fields.
|
|
@@ -603,6 +605,9 @@ ccflags="$@"
|
|
|
$2 ~ /^FSOPT_/ ||
|
|
|
$2 ~ /^WDIO[CFS]_/ ||
|
|
|
$2 ~ /^NFN/ ||
|
|
|
+ $2 !~ /^NFT_META_IIFTYPE/ &&
|
|
|
+ $2 ~ /^NFT_/ ||
|
|
|
+ $2 ~ /^NF_NAT_/ ||
|
|
|
$2 ~ /^XDP_/ ||
|
|
|
$2 ~ /^RWF_/ ||
|
|
|
$2 ~ /^(HDIO|WIN|SMART)_/ ||
|