src: allow for updating devices on existing netdev chain
Pablo Neira Ayuso
maintainerPATCH 1/1 src: allow for updating devices on existing netdev chain
This patch allows you to add/remove devices to an existing chain:
# cat ruleset.nft
table netdev x {
chain y {
type filter hook ingress devices = { eth0 } priority 0; policy accept;
}
}
# nft -f ruleset.nft
# nft add chain netdev x y '{ devices = { eth1 }; }'
# nft list ruleset
table netdev x {
chain y {
type filter hook ingress devices = { eth0, eth1 } priority 0; policy accept;
}
}
# nft delete chain netdev x y '{ devices = { eth0 }; }'
# nft list ruleset
table netdev x {
chain y {
type filter hook ingress devices = { eth1 } priority 0; policy accept;
}
}This patch also allows for creating an empty netdev chain, with no devices.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/evaluate.c | 7 +- src/mnl.c | 80 +++++++++++-------- src/monitor.c | 11 ++- src/parser_bison.y | 16 ++++ src/rule.c | 17 +++- .../testcases/chains/dumps/netdev_chain_0.nft | 5 ++ tests/shell/testcases/chains/netdev_chain_0 | 33 ++++++++ 7 files changed, 123 insertions(+), 46 deletions(-) create mode 100644 tests/shell/testcases/chains/dumps/netdev_chain_0.nft create mode 100755 tests/shell/testcases/chains/netdev_chain_0
src/evaluate.c +2 -5
@@ -4771,11 +4771,8 @@ static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain)if (chain->handle.family ==NFPROTO_NETDEV || (chain->handle.family ==NFPROTO_INET && chain->hook.num ==NF_INET_INGRESS )) { -if (!chain->dev_expr) -return __stmt_binary_error (ctx, &chain->loc,NULL , -"Missing `device' in this chain definition" ); - -if (!evaluate_device_expr (ctx, &chain->dev_expr)) +if (chain->dev_expr && + !evaluate_device_expr (ctx, &chain->dev_expr))return -1 ; }else if (chain->dev_expr) { return __stmt_binary_error(ctx, &chain->dev_expr->location, NULL,
src/mnl.c +45 -35
105 lines not on this page · raw message
src/monitor.c +7 -4
@@ -272,10 +272,13 @@ static int netlink_events_chain_cb(const struct nlmsghdr *nlh, int type,chain_print_plain (c, &monh->ctx->nft->output);break ;case NFT_MSG_DELCHAIN : -nft_mon_print (monh,"chain %s %s %s" , -family2str (c->handle.family), - c->handle.table.name, - c->handle.chain.name); +if (c->dev_array_len >0 ) +chain_print_plain (c, &monh->ctx->nft->output); +else +nft_mon_print (monh,"chain %s %s %s" , +family2str (c->handle.family), + c->handle.table.name, + c->handle.chain.name);break ; }nft_mon_print (monh,"\n" );
src/parser_bison.y +16 -0
@@ -1350,6 +1350,13 @@ delete_cmd : TABLE table_or_id_spec { $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_CHAIN, &$2, &@$, NULL); } + | CHAIN chain_spec chain_block_alloc + '{' chain_block '}' + { + $5->location = @5; + handle_merge(&$3->handle, &$2); + $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_CHAIN, &$2, &@$, $5); + } | RULE ruleid_spec { $$ = cmd_alloc(CMD_DELETE, CMD_OBJ_RULE, &$2, &@$, NULL);
@@ -1892,6 +1899,15 @@ chain_block : /* empty */ { $$ = $<chain>-1; } list_add_tail(&$2->list, &$1->rules); $$ = $1; } + | chain_block DEVICES '=' flowtable_expr stmt_separator + { + if ($$->dev_expr) { + list_splice_init(&$4->expressions, &$$->dev_expr->expressions); + expr_free($4); + break; + } + $$->dev_expr = $4; + } | chain_block comment_spec stmt_separator { if (already_set($1->comment, &@2, state)) {
src/rule.c +15 -2
@@ -1091,8 +1091,21 @@ void chain_print_plain(const struct chain *chain, struct output_ctx *octx)if (chain->flags &CHAIN_F_BASECHAIN ) {mpz_export_data (&policy, chain->policy->value,BYTEORDER_HOST_ENDIAN ,sizeof (int )); - nft_print(octx, " { type %s hook %s priority %s; policy %s; }", - chain->type.str, chain->hook.name, +nft_print (octx," { type %s hook %s " , + chain->type.str, chain->hook.name); + +if (chain->dev_array_len >0 ) { +int i; + +nft_print (octx,"devices = { " ); +for (i =0 ; i < chain->dev_array_len; i++) { +nft_print (octx,"%s" , chain->dev_array[i]); +if (i +1 != chain->dev_array_len) +nft_print (octx,", " ); + } +nft_print (octx," } " ); + } + nft_print(octx, "priority %s; policy %s; }", prio2str(octx, priobuf, sizeof(priobuf), chain->handle.family, chain->hook.num, chain->priority.expr),
tests/shell/testcases/chains/dumps/netdev_chain_0.nft new file +5 -0
@@ -0,0 +1,5 @@ +table netdev x { + chain y { + type filter hook ingress devices = { d0, d1 } priority filter; policy accept; + } +}
tests/shell/testcases/chains/netdev_chain_0 new file +33 -0
@@ -0,0 +1,33 @@ +#!/bin/bash + +ip link add d0 type dummy || { + echo "Skipping, no dummy interface available" + exit 0 +} +trap "ip link del d0" EXIT + +ip link add d1 type dummy || { + echo "Skipping, no dummy interface available" + exit 0 +} +trap "ip link del d1" EXIT + +ip link add d2 type dummy || { + echo "Skipping, no dummy interface available" + exit 0 +} +trap "ip link del d2" EXIT + +set -e + +RULESET="table netdev x { + chain y { + type filter hook ingress priority 0; policy accept; + } +}" + +$NFT -f - <<< "$RULESET" + +$NFT add chain netdev x y '{ devices = { d0 }; }' +$NFT add chain netdev x y '{ devices = { d1, d2, lo }; }' +$NFT delete chain netdev x y '{ devices = { lo }; }'
Signature · 1 line
2.30.2