diff options
author | Florian Westphal <fw@strlen.de> | 2019-01-09 23:26:05 +0100 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2019-01-09 23:32:02 +0100 |
commit | b338244abc7f018d79a95657fff88eadee7e9f6b (patch) | |
tree | bb8c96da078f7ad42d2d58b999310bef76d78395 | |
parent | bad27ca386276e64cd7a27abf3417b8a4be20fa4 (diff) |
src: fix netdev family device name parsing
Should use accept/use quotes, else you can't use this with a device name
that is shared with a key word, e.g. 'device vm'.
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | src/parser_bison.y | 2 | ||||
-rw-r--r-- | src/rule.c | 2 | ||||
-rw-r--r-- | tests/shell/testcases/chains/dumps/0021prio_0.nft | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index 39a3ab04..02a373cb 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -1969,7 +1969,7 @@ int_num : NUM { $$ = $1; } | DASH NUM { $$ = -$2; } ; -dev_spec : DEVICE STRING { $$ = $2; } +dev_spec : DEVICE string { $$ = $2; } | /* empty */ { $$ = NULL; } ; @@ -1070,7 +1070,7 @@ static void chain_print_declaration(const struct chain *chain, nft_print(octx, "\t\ttype %s hook %s", chain->type, hooknum2str(chain->handle.family, chain->hooknum)); if (chain->dev != NULL) - nft_print(octx, " device %s", chain->dev); + nft_print(octx, " device \"%s\"", chain->dev); nft_print(octx, " priority %s; policy %s;\n", prio2str(octx, priobuf, sizeof(priobuf), chain->handle.family, chain->hooknum, diff --git a/tests/shell/testcases/chains/dumps/0021prio_0.nft b/tests/shell/testcases/chains/dumps/0021prio_0.nft index 20125ba0..ca94d441 100644 --- a/tests/shell/testcases/chains/dumps/0021prio_0.nft +++ b/tests/shell/testcases/chains/dumps/0021prio_0.nft @@ -1364,23 +1364,23 @@ table arp x { } table netdev x { chain ingressfilterm11 { - type filter hook ingress device lo priority -11; policy accept; + type filter hook ingress device "lo" priority -11; policy accept; } chain ingressfilterm10 { - type filter hook ingress device lo priority filter - 10; policy accept; + type filter hook ingress device "lo" priority filter - 10; policy accept; } chain ingressfilter { - type filter hook ingress device lo priority filter; policy accept; + type filter hook ingress device "lo" priority filter; policy accept; } chain ingressfilterp10 { - type filter hook ingress device lo priority filter + 10; policy accept; + type filter hook ingress device "lo" priority filter + 10; policy accept; } chain ingressfilterp11 { - type filter hook ingress device lo priority 11; policy accept; + type filter hook ingress device "lo" priority 11; policy accept; } } table bridge x { |