src: ct eventmask support

Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h
index 8f3842690d176bb6d847e4a157dfc404d0e6f0f1..683f6f88fcacefa0898e3898cd75f31422fc0f9a 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -901,6 +901,7 @@ enum nft_rt_attributes {
  * @NFT_CT_BYTES: conntrack bytes
  * @NFT_CT_AVGPKT: conntrack average bytes per packet
  * @NFT_CT_ZONE: conntrack zone
+ * @NFT_CT_EVENTMASK: ctnetlink events to be generated for this conntrack
  */
 enum nft_ct_keys {
        NFT_CT_STATE,
@@ -921,6 +922,7 @@ enum nft_ct_keys {
        NFT_CT_BYTES,
        NFT_CT_AVGPKT,
        NFT_CT_ZONE,
+       NFT_CT_EVENTMASK,
 };
 
 /**

diff --git a/src/expr/ct.c b/src/expr/ct.c
index cdd08e95c86cca1261272beca6889eab87dfd636..0fba0d66801057d7d2b88308ac230f4ca93ea13b 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -32,7 +32,7 @@ struct nftnl_expr_ct {
 #define IP_CT_DIR_REPLY                1
 
 #ifndef NFT_CT_MAX
-#define NFT_CT_MAX (NFT_CT_ZONE + 1)
+#define NFT_CT_MAX (NFT_CT_EVENTMASK + 1)
 #endif
 
 static int
@@ -171,6 +171,7 @@ static const char *ctkey2str_array[NFT_CT_MAX] = {
        [NFT_CT_BYTES]          = "bytes",
        [NFT_CT_AVGPKT]         = "avgpkt",
        [NFT_CT_ZONE]           = "zone",
+       [NFT_CT_EVENTMASK]      = "eventmask",
 };
 
 static const char *ctkey2str(uint32_t ctkey)