src: add support for flowtable counter
Pablo Neira Ayuso
maintainerPATCH 1/1 src: add support for flowtable counter
Allow users to enable flow counters via control plane toggle, e.g.
table ip x {
flowtable y {
hook ingress priority 0;
counter;
}
chain z {
type filter hook ingress priority filter;
flow add @z
}}
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- include/rule.h | 1 + src/mnl.c | 3 +++ src/netlink.c | 2 ++ src/parser_bison.y | 4 ++++ src/rule.c | 4 ++++ 5 files changed, 14 insertions(+)
include/rule.h +1 -0
@@ -491,6 +491,7 @@ struct flowtable {const char **dev_array;struct expr *dev_expr;int dev_array_len; +uint32_t flags;unsigned int refcnt; };
src/mnl.c +3 -0
@@ -1629,6 +1629,9 @@ int mnl_nft_flowtable_add(struct netlink_ctx *ctx, struct cmd *cmd,free (dev_array); +nftnl_flowtable_set_u32 (flo,NFTNL_FLOWTABLE_FLAGS , + cmd->flowtable->flags); +netlink_dump_flowtable (flo, ctx); nlh = nftnl_nlmsg_build_hdr(nftnl_batch_buffer(ctx->batch),
src/netlink.c +2 -0
@@ -1342,6 +1342,8 @@ netlink_delinearize_flowtable(struct netlink_ctx *ctx, &priority); flowtable->hooknum =nftnl_flowtable_get_u32 (nlo,NFTNL_FLOWTABLE_HOOKNUM ); + flowtable->flags = +nftnl_flowtable_get_u32 (nlo,NFTNL_FLOWTABLE_FLAGS );return flowtable; }
src/parser_bison.y +4 -0
@@ -1892,6 +1892,10 @@ flowtable_block : /* empty */ { $$ = $<flowtable>-1; } { $$->dev_expr = $4; } + | COUNTER + { + $$->flags |= NFT_FLOWTABLE_COUNTER; + } ; flowtable_expr : '{' flowtable_list_expr '}'
src/rule.c +4 -0
@@ -2247,6 +2247,10 @@ static void flowtable_print_declaration(const struct flowtable *flowtable,nft_print (octx,", " ); }nft_print (octx," }%s" , opts->stmt_separator); + +if (flowtable->flags &NFT_FLOWTABLE_COUNTER ) +nft_print (octx,"%s%scounter%s" , opts->tab, opts->tab, + opts->stmt_separator); } static void do_flowtable_print(const struct flowtable *flowtable,
Signature · 1 line
2.11.0