diff options
| -rw-r--r-- | src/parser_bison.y | 2 | ||||
| -rwxr-xr-x | tests/shell/testcases/maps/map_with_flags_0 | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 119fd09c..e16b8a32 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -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 diff --git a/tests/shell/testcases/maps/map_with_flags_0 b/tests/shell/testcases/maps/map_with_flags_0 new file mode 100755 index 00000000..8774eb51 --- /dev/null +++ b/tests/shell/testcases/maps/map_with_flags_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 |