parser_bison: keep map flag around when flags are specified
Pablo Neira Ayuso
maintainerPATCH 1/1 parser_bison: keep map flag around when flags are specified
If you add a map with timeouts, eg.
# nft add table x
# nft add map x y { type ipv4_addr : ipv4_addr\; flags timeout\; }The listing shows a set instead of a map:
# nft list ruleset
table ip x {
set y {
type ipv4_addr
flags timeout
}
}This patch fixes the parser to keep the map flag around when timeout flag (or any other flags) are specified.
This patch also comes with a regression test.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/parser_bison.y | 2 +- tests/shell/testcases/maps/map_with_flags_0 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 tests/shell/testcases/maps/map_with_flags_0
src/parser_bison.y +1 -1
@@ -1071,7 +1071,7 @@ map_block : /* empty */ { $$ = $<set>-1; } } | map_block FLAGS set_flag_list stmt_seperator { - $1->flags = $3; + $1->flags |= $3; $$ = $1; } | map_block ELEMENTS '=' set_expr
tests/shell/testcases/maps/map_with_flags_0 new file +21 -0
@@ -0,0 +1,21 @@ +#!/bin/bash + +set -e + +$NFT add table x +$NFT add map x y { type ipv4_addr : ipv4_addr\; flags timeout\; } + +EXPECTED="table ip x { + map y { + type ipv4_addr : ipv4_addr + flags timeout + } +}" + +GET="$($NFT list ruleset)" + +if [ "$EXPECTED" != "$GET" ] ; then + DIFF="$(which diff)" + [ -x $DIFF ] && $DIFF -u <(echo "$EXPECTED") <(echo "$GET") + exit 1 +fi
Signature · 1 line
2.1.4