|
 |
f1d1c0 |
From e872d169c189f363ebbdc39105510c1809b58276 Mon Sep 17 00:00:00 2001
|
|
|
f1d1c0 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
f1d1c0 |
Date: Thu, 13 Feb 2020 17:48:18 +0100
|
|
|
f1d1c0 |
Subject: [PATCH] include: resync nf_tables.h cache copy
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1795224
|
|
|
f1d1c0 |
Upstream Status: nftables commit 9b94127950f98
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
commit 9b94127950f9848bc5a1505ae65ca3045ff68a16
|
|
|
f1d1c0 |
Author: Stefano Brivio <sbrivio@redhat.com>
|
|
|
f1d1c0 |
Date: Thu Jan 30 01:16:55 2020 +0100
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
include: resync nf_tables.h cache copy
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
Get this header in sync with nf-next as of merge commit
|
|
|
f1d1c0 |
b3a608222336 (5.6-rc1-ish).
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
|
|
|
f1d1c0 |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
f1d1c0 |
---
|
|
|
f1d1c0 |
include/linux/netfilter/nf_tables.h | 17 +++++++++++++++++
|
|
|
f1d1c0 |
1 file changed, 17 insertions(+)
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
|
|
|
f1d1c0 |
index ed8881a..1a99df3 100644
|
|
|
f1d1c0 |
--- a/include/linux/netfilter/nf_tables.h
|
|
|
f1d1c0 |
+++ b/include/linux/netfilter/nf_tables.h
|
|
|
f1d1c0 |
@@ -48,6 +48,7 @@ enum nft_registers {
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
#define NFT_REG_SIZE 16
|
|
|
f1d1c0 |
#define NFT_REG32_SIZE 4
|
|
|
f1d1c0 |
+#define NFT_REG32_COUNT (NFT_REG32_15 - NFT_REG32_00 + 1)
|
|
|
f1d1c0 |
|
|
|
f1d1c0 |
/**
|
|
|
f1d1c0 |
* enum nft_verdicts - nf_tables internal verdicts
|
|
|
bfbb76 |
@@ -299,14 +300,28 @@ enum nft_set_policies {
|
|
|
f1d1c0 |
* enum nft_set_desc_attributes - set element description
|
|
|
f1d1c0 |
*
|
|
|
f1d1c0 |
* @NFTA_SET_DESC_SIZE: number of elements in set (NLA_U32)
|
|
|
f1d1c0 |
+ * @NFTA_SET_DESC_CONCAT: description of field concatenation (NLA_NESTED)
|
|
|
f1d1c0 |
*/
|
|
|
f1d1c0 |
enum nft_set_desc_attributes {
|
|
|
f1d1c0 |
NFTA_SET_DESC_UNSPEC,
|
|
|
f1d1c0 |
NFTA_SET_DESC_SIZE,
|
|
|
f1d1c0 |
+ NFTA_SET_DESC_CONCAT,
|
|
|
f1d1c0 |
__NFTA_SET_DESC_MAX
|
|
|
f1d1c0 |
};
|
|
|
f1d1c0 |
#define NFTA_SET_DESC_MAX (__NFTA_SET_DESC_MAX - 1)
|
|
|
f1d1c0 |
|
|
|
bfbb76 |
+/**
|
|
|
f1d1c0 |
+ * enum nft_set_field_attributes - attributes of concatenated fields
|
|
|
f1d1c0 |
+ *
|
|
|
f1d1c0 |
+ * @NFTA_SET_FIELD_LEN: length of single field, in bits (NLA_U32)
|
|
|
f1d1c0 |
+ */
|
|
|
f1d1c0 |
+enum nft_set_field_attributes {
|
|
|
f1d1c0 |
+ NFTA_SET_FIELD_UNSPEC,
|
|
|
f1d1c0 |
+ NFTA_SET_FIELD_LEN,
|
|
|
f1d1c0 |
+ __NFTA_SET_FIELD_MAX
|
|
|
f1d1c0 |
+};
|
|
|
f1d1c0 |
+#define NFTA_SET_FIELD_MAX (__NFTA_SET_FIELD_MAX - 1)
|
|
|
f1d1c0 |
+
|
|
|
bfbb76 |
/**
|
|
|
f1d1c0 |
* enum nft_set_attributes - nf_tables set netlink attributes
|
|
|
f1d1c0 |
*
|
|
|
f1d1c0 |
@@ -368,6 +383,7 @@ enum nft_set_elem_flags {
|
|
|
f1d1c0 |
* @NFTA_SET_ELEM_USERDATA: user data (NLA_BINARY)
|
|
|
f1d1c0 |
* @NFTA_SET_ELEM_EXPR: expression (NLA_NESTED: nft_expr_attributes)
|
|
|
f1d1c0 |
* @NFTA_SET_ELEM_OBJREF: stateful object reference (NLA_STRING)
|
|
|
f1d1c0 |
+ * @NFTA_SET_ELEM_KEY_END: closing key value (NLA_NESTED: nft_data)
|
|
|
f1d1c0 |
*/
|
|
|
f1d1c0 |
enum nft_set_elem_attributes {
|
|
|
f1d1c0 |
NFTA_SET_ELEM_UNSPEC,
|
|
|
f1d1c0 |
@@ -380,6 +396,7 @@ enum nft_set_elem_attributes {
|
|
|
f1d1c0 |
NFTA_SET_ELEM_EXPR,
|
|
|
f1d1c0 |
NFTA_SET_ELEM_PAD,
|
|
|
f1d1c0 |
NFTA_SET_ELEM_OBJREF,
|
|
|
f1d1c0 |
+ NFTA_SET_ELEM_KEY_END,
|
|
|
f1d1c0 |
__NFTA_SET_ELEM_MAX
|
|
|
f1d1c0 |
};
|
|
|
f1d1c0 |
#define NFTA_SET_ELEM_MAX (__NFTA_SET_ELEM_MAX - 1)
|
|
|
f1d1c0 |
--
|
|
|
bfbb76 |
2.31.1
|
|
|
f1d1c0 |
|