From 046c3a145dc05cba8063c6702c4d60db079950d9 Mon Sep 17 00:00:00 2001 From: Liping Zhang Date: Sun, 25 Dec 2016 20:02:20 +0800 Subject: src: ct: add average bytes per packet counter support Similar to ct packets/bytes ... Signed-off-by: Liping Zhang Signed-off-by: Pablo Neira Ayuso --- include/linux/netfilter/nf_tables.h | 5 +++++ src/expr/ct.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 881d49e..b00a05d 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -860,6 +860,10 @@ enum nft_rt_attributes { * @NFT_CT_PROTOCOL: conntrack layer 4 protocol * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination + * @NFT_CT_LABELS: conntrack labels + * @NFT_CT_PKTS: conntrack packets + * @NFT_CT_BYTES: conntrack bytes + * @NFT_CT_AVGPKT: conntrack average bytes per packet */ enum nft_ct_keys { NFT_CT_STATE, @@ -878,6 +882,7 @@ enum nft_ct_keys { NFT_CT_LABELS, NFT_CT_PKTS, NFT_CT_BYTES, + NFT_CT_AVGPKT, }; /** diff --git a/src/expr/ct.c b/src/expr/ct.c index e680738..d3d352e 100644 --- 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_BYTES + 1) +#define NFT_CT_MAX (NFT_CT_AVGPKT + 1) #endif static int @@ -169,6 +169,7 @@ static const char *ctkey2str_array[NFT_CT_MAX] = { [NFT_CT_LABELS] = "label", [NFT_CT_PKTS] = "packets", [NFT_CT_BYTES] = "bytes", + [NFT_CT_AVGPKT] = "avgpkt", }; static const char *ctkey2str(uint32_t ctkey) -- cgit v1.2.3