| Message ID | 20210104110723.43564-1-yiche@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] selftests: netfilter: Pass the family parameter to conntrack tool | expand |
Please, Cc netfilter-devel@vger.kernel.org, and a more few comments below. On Mon, Jan 04, 2021 at 07:07:23PM +0800, Yi Chen wrote: > From: yiche <yiche@redhat.com> > > 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 > result after this statement is executed. Missing Fixes: tag ? > 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..ebdf2b23c8e3 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 [[ "$2" =~ "ipv6" ]];then > + local family=ipv6 > + else > + local family=ipv4 This branch coding style diverges from the existing code. > + fi
diff --git a/tools/testing/selftests/netfilter/nft_conntrack_helper.sh b/tools/testing/selftests/netfilter/nft_conntrack_helper.sh index edf0a48da6bf..ebdf2b23c8e3 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 [[ "$2" =~ "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