datatype: convert chain name from gmp value to string
Pablo Neira Ayuso
maintainerPATCH v2 1/2 datatype: convert chain name from gmp value to string
Add expr_chain_export() helper function to convert the chain name that is stored in a gmp value variable to string.
--- include/datatype.h | 2 ++ src/datatype.c | 21 +++++++++++++-------- src/datatype.cc | 0 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 src/datatype.cc
include/datatype.h +2 -0
@@ -305,4 +305,6 @@ extern struct error_record *rate_parse(const struct location *loc,extern struct error_record *data_unit_parse (const struct location *loc,const char *str,uint64_t *rate); +extern void expr_chain_export (const struct expr *e,char *chain); +#endif /* NFTABLES_DATATYPE_H */
src/datatype.c +13 -8
@@ -247,20 +247,25 @@ const struct datatype invalid_type = { .print = invalid_type_print, }; +void expr_chain_export (const struct expr *e,char *chain_name) +{ +unsigned int len; + + len = e->len /BITS_PER_BYTE ; +if (len >=NFT_CHAIN_MAXNAMELEN ) +BUG ("verdict expression length %u is too large (%u bits max)" , + e->len,NFT_CHAIN_MAXNAMELEN *BITS_PER_BYTE ); + +mpz_export_data (chain_name, e->value,BYTEORDER_HOST_ENDIAN , len); +} +static void verdict_jump_chain_print (const char *what,const struct expr *e,struct output_ctx *octx) {char chain[NFT_CHAIN_MAXNAMELEN ]; -unsigned int len;memset (chain,0 ,sizeof (chain)); - - len = e->len /BITS_PER_BYTE ; -if (len >=sizeof (chain)) -BUG ("verdict expression length %u is too large (%lu bits max)" , - e->len, (unsigned long )sizeof (chain) *BITS_PER_BYTE ); - -mpz_export_data (chain, e->value,BYTEORDER_HOST_ENDIAN , len); +expr_chain_export (e, chain);nft_print (octx,"%s %s" , what, chain); }
src/datatype.cc new file +0 -0
Signature · 1 line
2.20.1
Pablo Neira Ayuso
maintainerPATCH v2 2/2 src: support for implicit chain bindings
This patch allows you to group rules in a subchain, e.g.
table inet x {
chain y {
type filter hook input priority 0;
tcp dport 22 jump {
ip saddr { 127.0.0.0/8, 172.23.0.0/16, 192.168.13.0/24 } accept
ip6 saddr ::1/128 accept;
}
}}
This also supports for the `goto' chain verdict.
This patch adds a new chain binding list to avoid a chain list lookup from the delinearize path for the usual chains. This can be simplified later on with a single hashtable per table for all chains.
From the shell, you have to use the explicit separator ';', in bash you have to escape this:
# nft add rule inet x y tcp dport 80 jump { ip saddr 127.0.0.1 accept\; ip6 saddr ::1 accept \; }--- include/expression.h | 1 + include/linux/netfilter/nf_tables.h | 2 + include/netlink.h | 2 + include/parser.h | 2 +- include/rule.h | 7 ++++ include/statement.h | 11 ++++++ src/evaluate.c | 61 ++++++++++++++++++++++++++++- src/mnl.c | 19 ++++++++- src/netlink.c | 47 ++++++++++++++-------- src/netlink_delinearize.c | 37 +++++++++++++++-- src/netlink_linearize.c | 14 ++++++- src/parser_bison.y | 31 +++++++++++++-- src/rule.c | 49 +++++++++++++++++++++-- src/statement.c | 45 +++++++++++++++++++++ 14 files changed, 294 insertions(+), 34 deletions(-)
include/expression.h +1 -0
@@ -249,6 +249,7 @@ struct expr {/* EXPR_VERDICT */ int verdict;struct expr *chain; +uint32_t chain_id; };struct {/* EXPR_VALUE */
include/linux/netfilter/nf_tables.h +2 -0
@@ -209,6 +209,7 @@ enum nft_chain_attributes {NFTA_CHAIN_COUNTERS ,NFTA_CHAIN_PAD ,NFTA_CHAIN_FLAGS , +NFTA_CHAIN_ID , __NFTA_CHAIN_MAX };#define NFTA_CHAIN_MAX (__NFTA_CHAIN_MAX - 1)
@@ -238,6 +239,7 @@ enum nft_rule_attributes {NFTA_RULE_PAD ,NFTA_RULE_ID ,NFTA_RULE_POSITION_ID , +NFTA_RULE_CHAIN_ID , __NFTA_RULE_MAX };#define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1)
include/netlink.h +2 -0
@@ -64,6 +64,7 @@ struct netlink_ctx {struct nft_ctx *nft;struct list_head *msgs;struct list_head list; +struct list_head list_bindings;struct set *set;const void *data;uint32_t seqnum;
@@ -83,6 +84,7 @@ struct nft_data_linearize {uint32_t len;uint32_t value[4 ];char chain[NFT_CHAIN_MAXNAMELEN ]; +uint32_t chain_id;int verdict; };
include/parser.h +1 -1
@@ -11,7 +11,7 @@#define YYLTYPE_IS_TRIVIAL 0#define YYENABLE_NLS 0 -#define SCOPE_NEST_MAX 3 +#define SCOPE_NEST_MAX 4struct parser_state {struct input_descriptor *indesc;
include/rule.h +7 -0
@@ -79,6 +79,7 @@ struct handle {struct position_spec position;struct position_spec index;uint32_t set_id; +uint32_t chain_id;uint32_t rule_id;uint32_t position_id; };
@@ -155,6 +156,7 @@ struct table {struct list_head sets;struct list_head objs;struct list_head flowtables; +struct list_head chain_bindings;enum table_flags flags;unsigned int refcnt; };
@@ -176,6 +178,7 @@ extern struct table *table_lookup_fuzzy(const struct handle *h,enum chain_flags {CHAIN_F_BASECHAIN =0x1 ,CHAIN_F_HW_OFFLOAD =0x2 , +CHAIN_F_BINDING =0x4 , };/**
@@ -244,12 +247,16 @@ extern struct chain *chain_lookup(const struct table *table,extern struct chain *chain_lookup_fuzzy (const struct handle *h,const struct nft_cache *cache,const struct table **table); +extern struct chain *chain_binding_lookup (const struct table *table, +const char *chain_name);extern const char *family2str (unsigned int family);extern const char *hooknum2str (unsigned int family,unsigned int hooknum);extern const char *chain_policy2str (uint32_t policy);extern void chain_print_plain (const struct chain *chain,struct output_ctx *octx); +extern void chain_rules_print (const struct chain *chain, +struct output_ctx *octx,const char *indent);/** * struct rule - nftables rule
include/statement.h +11 -0
@@ -11,6 +11,14 @@ extern struct stmt *expr_stmt_alloc(const struct location *loc,extern struct stmt *verdict_stmt_alloc (const struct location *loc,struct expr *expr); +struct chain_stmt { +struct chain *chain; +struct expr *expr; +}; + +struct stmt *chain_stmt_alloc (const struct location *loc,struct chain *chain, +enum nft_verdicts verdict); +struct flow_stmt {const char *table_name; };
@@ -287,6 +295,7 @@ extern struct stmt *xt_stmt_alloc(const struct location *loc);* @STMT_CONNLIMIT: connection limit statement * @STMT_MAP: map statement * @STMT_SYNPROXY: synproxy statement +* @STMT_CHAIN: chain statement */ enum stmt_types {STMT_INVALID ,
@@ -315,6 +324,7 @@ enum stmt_types {STMT_CONNLIMIT ,STMT_MAP ,STMT_SYNPROXY , + STMT_CHAIN, };/**
@@ -380,6 +390,7 @@ struct stmt {struct flow_stmt flow;struct map_stmt map;struct synproxy_stmt synproxy; +struct chain_stmt chain; }; };
src/evaluate.c +60 -1
79 lines not on this page · raw message
src/mnl.c +17 -2
@@ -466,7 +466,11 @@ int mnl_nft_rule_add(struct netlink_ctx *ctx, struct cmd *cmd,cmd_add_loc (cmd, nlh->nlmsg_len, &h->table.location);mnl_attr_put_strz (nlh,NFTA_RULE_TABLE , h->table.name);cmd_add_loc (cmd, nlh->nlmsg_len, &h->chain.location); -mnl_attr_put_strz (nlh,NFTA_RULE_CHAIN , h->chain.name); + +if (h->chain_id) +mnl_attr_put_u32 (nlh,NFTA_RULE_CHAIN_ID ,htonl (h->chain_id)); +else +mnl_attr_put_strz (nlh,NFTA_RULE_CHAIN , h->chain.name);nftnl_rule_nlmsg_build_payload (nlh, nlr);nftnl_rule_free (nlr);
@@ -679,7 +683,18 @@ int mnl_nft_chain_add(struct netlink_ctx *ctx, struct cmd *cmd,cmd_add_loc (cmd, nlh->nlmsg_len, &cmd->handle.table.location);mnl_attr_put_strz (nlh,NFTA_CHAIN_TABLE , cmd->handle.table.name);cmd_add_loc (cmd, nlh->nlmsg_len, &cmd->handle.chain.location); -mnl_attr_put_strz (nlh,NFTA_CHAIN_NAME , cmd->handle.chain.name); + +if (!cmd->chain || !(cmd->chain->flags &CHAIN_F_BINDING )) { +mnl_attr_put_strz (nlh,NFTA_CHAIN_NAME , cmd->handle.chain.name); + }else { +if (cmd->handle.chain.name) +mnl_attr_put_strz (nlh,NFTA_CHAIN_NAME , + cmd->handle.chain.name); + +mnl_attr_put_u32 (nlh,NFTA_CHAIN_ID ,htonl (cmd->handle.chain_id)); +if (cmd->chain->flags) +nftnl_chain_set_u32 (nlc,NFTNL_CHAIN_FLAGS , cmd->chain->flags); + }if (cmd->chain && cmd->chain->policy) { mpz_export_data(&policy, cmd->chain->policy->value,
src/netlink.c +30 -17
68 lines not on this page · raw message
src/netlink_delinearize.c +33 -4
@@ -163,6 +163,24 @@ err:return NULL ; } +static void netlink_parse_chain_verdict (struct netlink_parse_ctx *ctx, +const struct location *loc, +struct expr *expr, +enum nft_verdicts verdict) +{ +char chain_name[NFT_CHAIN_MAXNAMELEN ] = {}; +struct chain *chain; + +expr_chain_export (expr->chain, chain_name); + chain =chain_binding_lookup (ctx->table, chain_name); +if (chain) { + ctx->stmt =chain_stmt_alloc (loc, chain, verdict); +expr_free (expr); + }else { + ctx->stmt =verdict_stmt_alloc (loc, expr); + } +} +static void netlink_parse_immediate (struct netlink_parse_ctx *ctx,const struct location *loc,const struct nftnl_expr *nle)
@@ -182,12 +200,23 @@ static void netlink_parse_immediate(struct netlink_parse_ctx *ctx, } dreg =netlink_parse_register (nle,NFTNL_EXPR_IMM_DREG ); - expr =netlink_alloc_data (loc, &nld, dreg); -if (dreg ==NFT_REG_VERDICT ) - ctx->stmt =verdict_stmt_alloc (loc, expr); -else + +if (dreg ==NFT_REG_VERDICT ) { +switch (expr->verdict) { +case NFT_JUMP : +netlink_parse_chain_verdict (ctx, loc, expr,NFT_JUMP ); +break ; +case NFT_GOTO : +netlink_parse_chain_verdict (ctx, loc, expr,NFT_GOTO ); +break ; +default : + ctx->stmt =verdict_stmt_alloc (loc, expr); +break ; + } + }else {netlink_set_register (ctx, dreg, expr); + } } static void netlink_parse_xfrm(struct netlink_parse_ctx *ctx,
src/netlink_linearize.c +12 -2
@@ -712,10 +712,12 @@ static void netlink_gen_immediate(struct netlink_linearize_ctx *ctx,nftnl_expr_set (nle,NFTNL_EXPR_IMM_DATA , nld.value, nld.len);break ;case EXPR_VERDICT : -if ((expr->chain !=NULL ) && - !nftnl_expr_is_set (nle,NFTNL_EXPR_IMM_CHAIN )) { +if (expr->chain) {nftnl_expr_set_str (nle,NFTNL_EXPR_IMM_CHAIN , nld.chain); + }else if (expr->chain_id) { +nftnl_expr_set_u32 (nle,NFTNL_EXPR_IMM_CHAIN_ID , + nld.chain_id); }nftnl_expr_set_u32 (nle,NFTNL_EXPR_IMM_VERDICT , nld.verdict);break ;
@@ -1442,6 +1444,12 @@ static void netlink_gen_meter_stmt(struct netlink_linearize_ctx *ctx,nftnl_rule_add_expr (ctx->nlr, nle); } +static void netlink_gen_chain_stmt (struct netlink_linearize_ctx *ctx, +const struct stmt *stmt) +{ +return netlink_gen_expr (ctx, stmt->chain.expr,NFT_REG_VERDICT ); +} +static void netlink_gen_stmt (struct netlink_linearize_ctx *ctx,const struct stmt *stmt) {
@@ -1495,6 +1503,8 @@ static void netlink_gen_stmt(struct netlink_linearize_ctx *ctx,return netlink_gen_objref_stmt (ctx, stmt);case STMT_MAP :return netlink_gen_map_stmt (ctx, stmt); +case STMT_CHAIN : +return netlink_gen_chain_stmt (ctx, stmt);default :BUG ("unknown statement type %s\n" , stmt->ops->name); }
src/parser_bison.y +28 -3
@@ -594,8 +594,8 @@ int nft_lex(void *, void *, void *); %type <table> table_block_alloc table_block %destructor { close_scope(state); table_free($$); } table_block_alloc -%type <chain> chain_block_alloc chain_block -%destructor { close_scope(state); chain_free($$); } chain_block_alloc +%type <chain> chain_block_alloc chain_block subchain_block +%destructor { close_scope(state); chain_free($$); } chain_block_alloc subchain_block %type <rule> rule rule_alloc %destructor { rule_free($$); } rule
@@ -642,7 +642,9 @@ int nft_lex(void *, void *, void *); %destructor { stmt_free($$); } tproxy_stmt %type <stmt> synproxy_stmt synproxy_stmt_alloc %destructor { stmt_free($$); } synproxy_stmt synproxy_stmt_alloc - +%type <stmt> chain_stmt +%destructor { stmt_free($$); } chain_stmt +%type <val> chain_stmt_type %type <stmt> queue_stmt queue_stmt_alloc %destructor { stmt_free($$); } queue_stmt queue_stmt_alloc
@@ -1682,6 +1684,15 @@ chain_block : /* empty */ { $$ = $<chain>-1; } } ; +subchain_block : /* empty */ { $$ = $<chain>-1; } + | subchain_block stmt_separator + | subchain_block rule stmt_separator + { + list_add_tail(&$2->list, &$1->rules); + $$ = $1; + } + ; + typeof_expr : primary_expr { if (expr_ops($1)->build_udata == NULL) {
@@ -2527,6 +2538,20 @@ stmt : verdict_stmt | set_stmt | map_stmt | synproxy_stmt + | chain_stmt + ; + +chain_stmt_type : JUMP { $$ = NFT_JUMP; } + | GOTO { $$ = NFT_GOTO; } + ; + +chain_stmt : chain_stmt_type chain_block_alloc '{' subchain_block '}' + { + $2->location = @2; + close_scope(state); + $4->location = @4; + $$ = chain_stmt_alloc(&@$, $4, $1); + } ; verdict_stmt : verdict_expr
src/rule.c +45 -4
129 lines not on this page · raw message
src/statement.c +45 -0
57 lines not on this page · raw message
Signature · 1 line
2.20.1