tests: shell: Fix testcases for changed ip6tables opts output
Phil Sutter
reviewerPATCH 1/3 tests: shell: Fix testcases for changed ip6tables opts output
Adjust captured output, ip6tables prints '--' instead of spaces since the commit in Fixes: tag.
--- .../testcases/ip6tables/0002-verbose-output_0 | 20 +++++++++---------- .../ipt-restore/0014-verbose-restore_0 | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-)
iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0 +10 -10
@@ -6,15 +6,15 @@ set -e # ensure verbose output is identical between legacy and nft tools RULE1='-i eth2 -o eth3 -s feed:babe::1 -d feed:babe::2 -j ACCEPT' -VOUT1='ACCEPT all opt in eth2 out eth3 feed:babe::1 -> feed:babe::2' +VOUT1='ACCEPT all opt -- in eth2 out eth3 feed:babe::1 -> feed:babe::2' RULE2='-i eth2 -o eth3 -s feed:babe::4 -d feed:babe::5 -j ACCEPT' -VOUT2='ACCEPT all opt in eth2 out eth3 feed:babe::4 -> feed:babe::5' +VOUT2='ACCEPT all opt -- in eth2 out eth3 feed:babe::4 -> feed:babe::5' RULE3='-p icmpv6 -m icmp6 --icmpv6-type no-route' -VOUT3=' ipv6-icmp opt in * out * ::/0 -> ::/0 ipv6-icmptype 1 code 0' +VOUT3=' ipv6-icmp opt -- in * out * ::/0 -> ::/0 ipv6-icmptype 1 code 0' RULE4='-m dst --dst-len 42 -m rt --rt-type 23' -VOUT4=' all opt in * out * ::/0 -> ::/0 dst length:42 rt type:23' +VOUT4=' all opt -- in * out * ::/0 -> ::/0 dst length:42 rt type:23' RULE5='-m frag --fragid 1337 -j LOG' -VOUT5='LOG all opt in * out * ::/0 -> ::/0 frag id:1337 LOG flags 0 level 4' +VOUT5='LOG all opt -- in * out * ::/0 -> ::/0 frag id:1337 LOG flags 0 level 4' diff -u -Z <(echo -e "$VOUT1") <($XT_MULTI ip6tables -v -A FORWARD $RULE1) diff -u -Z <(echo -e "$VOUT2") <($XT_MULTI ip6tables -v -I FORWARD 2 $RULE2)
@@ -33,11 +33,11 @@ EXPECT='Chain INPUT (policy ACCEPT 0 packets, 0 bytes) Chain FORWARD (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination - 0 0 ACCEPT all eth2 eth3 feed:babe::1 feed:babe::2 - 0 0 ACCEPT all eth2 eth3 feed:babe::4 feed:babe::5 - 0 0 ipv6-icmp * * ::/0 ::/0 ipv6-icmptype 1 code 0 - 0 0 all * * ::/0 ::/0 dst length:42 rt type:23 - 0 0 LOG all * * ::/0 ::/0 frag id:1337 LOG flags 0 level 4 + 0 0 ACCEPT all -- eth2 eth3 feed:babe::1 feed:babe::2 + 0 0 ACCEPT all -- eth2 eth3 feed:babe::4 feed:babe::5 + 0 0 ipv6-icmp-- * * ::/0 ::/0 ipv6-icmptype 1 code 0 + 0 0 all -- * * ::/0 ::/0 dst length:42 rt type:23 + 0 0 LOG all -- * * ::/0 ::/0 frag id:1337 LOG flags 0 level 4 Chain OUTPUT (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination'
iptables/tests/shell/testcases/ipt-restore/0014-verbose-restore_0 +1 -1
@@ -60,7 +60,7 @@ Flushing chain \`OUTPUT' Flushing chain \`secfoo' Deleting chain \`secfoo'" -EXPECT6=$(sed -e 's/0\.0\.0\.0/::/g' -e 's/opt --/opt /' <<< "$EXPECT") +EXPECT6=$(sed -e 's/0\.0\.0\.0/::/g' <<< "$EXPECT") diff -u -Z <(echo "$EXPECT") <($XT_MULTI iptables-restore -v <<< "$DUMP") diff -u -Z <(echo "$EXPECT6") <($XT_MULTI ip6tables-restore -v <<< "$DUMP")
Signature · 1 line
2.34.1
Phil Sutter
reviewerPATCH 2/3 xshared: Fix for missing space after 'prot' column
Format string ensured a minimum field width of five characters, but allowed for longer strings to eat the column delimiting white space.
--- .../tests/shell/testcases/ip6tables/0002-verbose-output_0 | 2 +- iptables/xshared.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0 +1 -1
@@ -35,7 +35,7 @@ Chain FORWARD (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 ACCEPT all -- eth2 eth3 feed:babe::1 feed:babe::2 0 0 ACCEPT all -- eth2 eth3 feed:babe::4 feed:babe::5 - 0 0 ipv6-icmp-- * * ::/0 ::/0 ipv6-icmptype 1 code 0 + 0 0 ipv6-icmp -- * * ::/0 ::/0 ipv6-icmptype 1 code 0 0 0 all -- * * ::/0 ::/0 dst length:42 rt type:23 0 0 LOG all -- * * ::/0 ::/0 frag id:1337 LOG flags 0 level 4
iptables/xshared.c +2 -2
@@ -1093,9 +1093,9 @@ void print_rule_details(unsigned int linenum, const struct xt_counters *ctrs,fputc (invflags &XT_INV_PROTO ?'!' :' ' , stdout);if (pname) -printf (FMT ("%-5s" ,"%s " ), pname); +printf (FMT ("%-4s " ,"%s " ), pname);else -printf (FMT ("%-5hu" ,"%hu " ), proto); +printf (FMT ("%-4hu " ,"%hu " ), proto); } void save_rule_details(const char *iniface, unsigned const char *iniface_mask,
Signature · 1 line
2.34.1
Phil Sutter
reviewerPATCH 3/3 xshared: Print protocol numbers if --numeric was given
In reply to Phil SutterThis is much trickier than expected: On one hand, proto_to_name() is used to lookup protocol extensions so must resolve despite FMT_NUMERIC being set. On the other, --verbose implies --numeric but changing the output there is probably a bad idea. Luckily the latter situation is identified by FMT_NOTABLE bit.
--- .../shell/testcases/ip6tables/0002-verbose-output_0 | 10 +++++----- .../testcases/ipt-restore/0011-noflush-empty-line_0 | 2 +- .../shell/testcases/iptables/0002-verbose-output_0 | 4 ++-- iptables/xshared.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-)
iptables/tests/shell/testcases/ip6tables/0002-verbose-output_0 +5 -5
@@ -33,11 +33,11 @@ EXPECT='Chain INPUT (policy ACCEPT 0 packets, 0 bytes) Chain FORWARD (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination - 0 0 ACCEPT all -- eth2 eth3 feed:babe::1 feed:babe::2 - 0 0 ACCEPT all -- eth2 eth3 feed:babe::4 feed:babe::5 - 0 0 ipv6-icmp -- * * ::/0 ::/0 ipv6-icmptype 1 code 0 - 0 0 all -- * * ::/0 ::/0 dst length:42 rt type:23 - 0 0 LOG all -- * * ::/0 ::/0 frag id:1337 LOG flags 0 level 4 + 0 0 ACCEPT 0 -- eth2 eth3 feed:babe::1 feed:babe::2 + 0 0 ACCEPT 0 -- eth2 eth3 feed:babe::4 feed:babe::5 + 0 0 58 -- * * ::/0 ::/0 ipv6-icmptype 1 code 0 + 0 0 0 -- * * ::/0 ::/0 dst length:42 rt type:23 + 0 0 LOG 0 -- * * ::/0 ::/0 frag id:1337 LOG flags 0 level 4 Chain OUTPUT (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination'
iptables/tests/shell/testcases/ipt-restore/0011-noflush-empty-line_0 +1 -1
@@ -12,5 +12,5 @@ EOF EXPECT='Chain FORWARD (policy ACCEPT) target prot opt source destination -ACCEPT all -- 0.0.0.0/0 0.0.0.0/0 ' +ACCEPT 0 -- 0.0.0.0/0 0.0.0.0/0 ' diff -u <(echo "$EXPECT") <($XT_MULTI iptables -n -L FORWARD)
iptables/tests/shell/testcases/iptables/0002-verbose-output_0 +2 -2
@@ -21,8 +21,8 @@ EXPECT='Chain INPUT (policy ACCEPT 0 packets, 0 bytes) Chain FORWARD (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination - 0 0 ACCEPT all -- eth2 eth3 10.0.0.1 10.0.0.2 - 0 0 ACCEPT all -- eth2 eth3 10.0.0.4 10.0.0.5 + 0 0 ACCEPT 0 -- eth2 eth3 10.0.0.1 10.0.0.2 + 0 0 ACCEPT 0 -- eth2 eth3 10.0.0.4 10.0.0.5 Chain OUTPUT (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination'
iptables/xshared.c +3 -3
@@ -1092,10 +1092,10 @@ void print_rule_details(unsigned int linenum, const struct xt_counters *ctrs,fputc (invflags &XT_INV_PROTO ?'!' :' ' , stdout); -if (pname) -printf (FMT ("%-4s " ,"%s " ), pname); -else +if (((format & (FMT_NUMERIC |FMT_NOTABLE )) ==FMT_NUMERIC ) || !pname)printf (FMT ("%-4hu " ,"%hu " ), proto); +else +printf (FMT ("%-4s " ,"%s " ), pname); } void save_rule_details(const char *iniface, unsigned const char *iniface_mask,
Signature · 1 line
2.34.1
Florian Westphal
maintainerQuoted 2 lines · Phil Sutter
Adjust captured output, ip6tables prints '--' instead of spaces since the commit in Fixes: tag.
Thanks, all 3 patches look good to me.
Phil Sutter
reviewerQuoted 5 lines · Florian Westphal
Quoted 2 lines · Phil Sutter
Adjust captured output, ip6tables prints '--' instead of spaces since the commit in Fixes: tag.
Thanks, all 3 patches look good to me.
Series applied, thanks for your review.
Cheers, Phil
Quoted 11 lines · Phil Sutter
Quoted 5 lines · Florian Westphal
Quoted 2 lines · Phil Sutter
Adjust captured output, ip6tables prints '--' instead of spaces since the commit in Fixes: tag.
Thanks, all 3 patches look good to me.
Series applied, thanks for your review.
Cheers, Phil
Thank you for taking care of the fixes Phil, much appreciated.
Regards,
Erik