src: ct: add packet and byte counter 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 9d65ac27e6efb1033f3b296a256618975d1a502f..b491966b0a1a0bc06d3bceaadf5ef6d42d8d5387 100644 (file)
--- a/include/linux/netfilter/nf_tables.h
+++ b/include/linux/netfilter/nf_tables.h
@@ -755,6 +755,8 @@ enum nft_ct_keys {
        NFT_CT_PROTO_SRC,
        NFT_CT_PROTO_DST,
        NFT_CT_LABELS,
+       NFT_CT_PKTS,
+       NFT_CT_BYTES,
 };
 
 /**

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 584dffee29225cb78b67ea514d49e25ffdf824d7..4bee6b15b22cb2e0907532a2d90c0fb93ebe633e 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_LABELS + 1)
+#define NFT_CT_MAX (NFT_CT_BYTES + 1)
 #endif
 
 static int
@@ -167,6 +167,8 @@ const char *ctkey2str_array[NFT_CT_MAX] = {
        [NFT_CT_PROTO_SRC]      = "proto_src",
        [NFT_CT_PROTO_DST]      = "proto_dst",
        [NFT_CT_LABELS]         = "label",
+       [NFT_CT_PKTS]           = "packets",
+       [NFT_CT_BYTES]          = "bytes",
 };
 
 static const char *ctkey2str(uint32_t ctkey)