|
 |
2ba76c |
From fdedadd0dc934100a11c0a942c0b62193a4c0cf1 Mon Sep 17 00:00:00 2001
|
|
|
2ba76c |
From: Felix Janda <felix.janda@posteo.de>
|
|
|
2ba76c |
Date: Sat, 16 May 2015 13:35:14 +0200
|
|
|
2ba76c |
Subject: [PATCH] include: Sync with kernel headers
|
|
|
2ba76c |
|
|
|
2ba76c |
Signed-off-by: Felix Janda <felix.janda@posteo.de>
|
|
|
2ba76c |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
2ba76c |
(cherry picked from commit 7d55aff4686a5910f84b9045c98d6f01e1daa297)
|
|
|
2ba76c |
---
|
|
|
2ba76c |
include/linux/netfilter/nfnetlink.h | 52 ++++++-----------------------
|
|
|
2ba76c |
1 file changed, 11 insertions(+), 41 deletions(-)
|
|
|
2ba76c |
|
|
|
2ba76c |
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
|
|
|
2ba76c |
index f1b546e85d590..c755646752011 100644
|
|
|
2ba76c |
--- a/include/linux/netfilter/nfnetlink.h
|
|
|
2ba76c |
+++ b/include/linux/netfilter/nfnetlink.h
|
|
|
2ba76c |
@@ -18,6 +18,10 @@ enum nfnetlink_groups {
|
|
|
2ba76c |
#define NFNLGRP_CONNTRACK_EXP_UPDATE NFNLGRP_CONNTRACK_EXP_UPDATE
|
|
|
2ba76c |
NFNLGRP_CONNTRACK_EXP_DESTROY,
|
|
|
2ba76c |
#define NFNLGRP_CONNTRACK_EXP_DESTROY NFNLGRP_CONNTRACK_EXP_DESTROY
|
|
|
2ba76c |
+ NFNLGRP_NFTABLES,
|
|
|
2ba76c |
+#define NFNLGRP_NFTABLES NFNLGRP_NFTABLES
|
|
|
2ba76c |
+ NFNLGRP_ACCT_QUOTA,
|
|
|
2ba76c |
+#define NFNLGRP_ACCT_QUOTA NFNLGRP_ACCT_QUOTA
|
|
|
2ba76c |
__NFNLGRP_MAX,
|
|
|
2ba76c |
};
|
|
|
2ba76c |
#define NFNLGRP_MAX (__NFNLGRP_MAX - 1)
|
|
|
2ba76c |
@@ -51,46 +55,12 @@ struct nfgenmsg {
|
|
|
2ba76c |
#define NFNL_SUBSYS_ACCT 7
|
|
|
2ba76c |
#define NFNL_SUBSYS_CTNETLINK_TIMEOUT 8
|
|
|
2ba76c |
#define NFNL_SUBSYS_CTHELPER 9
|
|
|
2ba76c |
-#define NFNL_SUBSYS_COUNT 10
|
|
|
2ba76c |
+#define NFNL_SUBSYS_NFTABLES 10
|
|
|
2ba76c |
+#define NFNL_SUBSYS_NFT_COMPAT 11
|
|
|
2ba76c |
+#define NFNL_SUBSYS_COUNT 12
|
|
|
2ba76c |
|
|
|
2ba76c |
-#ifdef __KERNEL__
|
|
|
2ba76c |
+/* Reserved control nfnetlink messages */
|
|
|
2ba76c |
+#define NFNL_MSG_BATCH_BEGIN NLMSG_MIN_TYPE
|
|
|
2ba76c |
+#define NFNL_MSG_BATCH_END NLMSG_MIN_TYPE+1
|
|
|
2ba76c |
|
|
|
2ba76c |
-#include <linux/netlink.h>
|
|
|
2ba76c |
-#include <linux/capability.h>
|
|
|
2ba76c |
-#include <net/netlink.h>
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-struct nfnl_callback {
|
|
|
2ba76c |
- int (*call)(struct sock *nl, struct sk_buff *skb,
|
|
|
2ba76c |
- const struct nlmsghdr *nlh,
|
|
|
2ba76c |
- const struct nlattr * const cda[]);
|
|
|
2ba76c |
- int (*call_rcu)(struct sock *nl, struct sk_buff *skb,
|
|
|
2ba76c |
- const struct nlmsghdr *nlh,
|
|
|
2ba76c |
- const struct nlattr * const cda[]);
|
|
|
2ba76c |
- const struct nla_policy *policy; /* netlink attribute policy */
|
|
|
2ba76c |
- const u_int16_t attr_count; /* number of nlattr's */
|
|
|
2ba76c |
-};
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-struct nfnetlink_subsystem {
|
|
|
2ba76c |
- const char *name;
|
|
|
2ba76c |
- __u8 subsys_id; /* nfnetlink subsystem ID */
|
|
|
2ba76c |
- __u8 cb_count; /* number of callbacks */
|
|
|
2ba76c |
- const struct nfnl_callback *cb; /* callback for individual types */
|
|
|
2ba76c |
-};
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
|
|
|
2ba76c |
-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-extern int nfnetlink_has_listeners(struct net *net, unsigned int group);
|
|
|
2ba76c |
-extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned group,
|
|
|
2ba76c |
- int echo, gfp_t flags);
|
|
|
2ba76c |
-extern int nfnetlink_set_err(struct net *net, u32 pid, u32 group, int error);
|
|
|
2ba76c |
-extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u_int32_t pid, int flags);
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-extern void nfnl_lock(void);
|
|
|
2ba76c |
-extern void nfnl_unlock(void);
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
|
|
|
2ba76c |
- MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
|
|
|
2ba76c |
-
|
|
|
2ba76c |
-#endif /* __KERNEL__ */
|
|
|
2ba76c |
-#endif /* _NFNETLINK_H */
|
|
|
2ba76c |
+#endif /* _NFNETLINK_H */
|
|
|
2ba76c |
--
|
|
|
2ba76c |
2.34.1
|
|
|
2ba76c |
|