| Message ID | 20210105094316.23683-1-yiche@redhat.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [PATCHv2,net] selftests: netfilter: Pass the family parameter to conntrack tool | expand |
On Tue, Jan 05, 2021 at 05:43:16PM +0800, Yi Chen wrote: > From: yiche <yiche@redhat.com> > > Fixes: 619ae8e0697a6 ("selftests: netfilter: add test case for conntrack helper assignment") > > Fix nft_conntrack_helper.sh fake fail: > conntrack tool need "-f ipv6" parameter to show out ipv6 traffic items. > sleep 1 second after background nc send packet, to make sure check > is after this statement executed. The Fixes tag should be above your signoff tag Fixes: 619ae8e0697a6 ("selftests: netfilter: add test case for conntrack helper assignment") > Signed-off-by: yiche <yiche@redhat.com> > --- > .../selftests/netfilter/nft_conntrack_helper.sh | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/netfilter/nft_conntrack_helper.sh b/tools/testing/selftests/netfilter/nft_conntrack_helper.sh > index edf0a48da6bf..bf6b9626c7dd 100755 > --- a/tools/testing/selftests/netfilter/nft_conntrack_helper.sh > +++ b/tools/testing/selftests/netfilter/nft_conntrack_helper.sh > @@ -94,7 +94,13 @@ check_for_helper() > local message=$2 > local port=$3 > > - ip netns exec ${netns} conntrack -L -p tcp --dport $port 2> /dev/null |grep -q 'helper=ftp' > + if echo $message |grep -q 'ipv6';then > + local family="ipv6" > + else > + local family="ipv4" > + fi > + > + ip netns exec ${netns} conntrack -L -f $family -p tcp --dport $port 2> /dev/null |grep -q 'helper=ftp' > if [ $? -ne 0 ] ; then > echo "FAIL: ${netns} did not show attached helper $message" 1>&2 > ret=1 > @@ -111,8 +117,8 @@ test_helper() > > sleep 3 | ip netns exec ${ns2} nc -w 2 -l -p $port > /dev/null & > > - sleep 1 > sleep 1 | ip netns exec ${ns1} nc -w 2 10.0.1.2 $port > /dev/null & > + sleep 1 > > check_for_helper "$ns1" "ip $msg" $port > check_for_helper "$ns2" "ip $msg" $port > @@ -128,8 +134,8 @@ test_helper() > > sleep 3 | ip netns exec ${ns2} nc -w 2 -6 -l -p $port > /dev/null & > > - sleep 1 > sleep 1 | ip netns exec ${ns1} nc -w 2 -6 dead:1::2 $port > /dev/null & > + sleep 1 > > check_for_helper "$ns1" "ipv6 $msg" $port > check_for_helper "$ns2" "ipv6 $msg" $port > -- > 2.26.2 >
diff --git a/tools/testing/selftests/netfilter/nft_conntrack_helper.sh b/tools/testing/selftests/netfilter/nft_conntrack_helper.sh index edf0a48da6bf..bf6b9626c7dd 100755 --- a/tools/testing/selftests/netfilter/nft_conntrack_helper.sh +++ b/tools/testing/selftests/netfilter/nft_conntrack_helper.sh @@ -94,7 +94,13 @@ check_for_helper() local message=$2 local port=$3 - ip netns exec ${netns} conntrack -L -p tcp --dport $port 2> /dev/null |grep -q 'helper=ftp' + if echo $message |grep -q 'ipv6';then + local family="ipv6" + else + local family="ipv4" + fi + + ip netns exec ${netns} conntrack -L -f $family -p tcp --dport $port 2> /dev/null |grep -q 'helper=ftp' if [ $? -ne 0 ] ; then echo "FAIL: ${netns} did not show attached helper $message" 1>&2 ret=1 @@ -111,8 +117,8 @@ test_helper() sleep 3 | ip netns exec ${ns2} nc -w 2 -l -p $port > /dev/null & - sleep 1 sleep 1 | ip netns exec ${ns1} nc -w 2 10.0.1.2 $port > /dev/null & + sleep 1 check_for_helper "$ns1" "ip $msg" $port check_for_helper "$ns2" "ip $msg" $port @@ -128,8 +134,8 @@ test_helper() sleep 3 | ip netns exec ${ns2} nc -w 2 -6 -l -p $port > /dev/null & - sleep 1 sleep 1 | ip netns exec ${ns1} nc -w 2 -6 dead:1::2 $port > /dev/null & + sleep 1 check_for_helper "$ns1" "ipv6 $msg" $port check_for_helper "$ns2" "ipv6 $msg" $port