diff options
| author | Florian Westphal <fw@strlen.de> | 2021-12-03 15:33:23 +0100 | 
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2021-12-08 01:29:15 +0100 | 
| commit | d46cea0e6933da93c5373a46e3dc7e5d0e56bedb (patch) | |
| tree | a9eac35c039ad9ac83dc87efa083484b3fd7de23 | |
| parent | 962e5a40358787105f126ab1dc01604da3d169e9 (diff) | |
selftests: netfilter: switch zone stress to socat
centos9 has nmap-ncat which doesn't like the '-q' option, use socat.
While at it, mark test skipped if needed tools are missing.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rwxr-xr-x | tools/testing/selftests/netfilter/nft_zones_many.sh | 19 | 
1 files changed, 13 insertions, 6 deletions
| diff --git a/tools/testing/selftests/netfilter/nft_zones_many.sh b/tools/testing/selftests/netfilter/nft_zones_many.sh index ac646376eb01..04633119b29a 100755 --- a/tools/testing/selftests/netfilter/nft_zones_many.sh +++ b/tools/testing/selftests/netfilter/nft_zones_many.sh @@ -18,11 +18,17 @@ cleanup()  	ip netns del $ns  } -ip netns add $ns -if [ $? -ne 0 ];then -	echo "SKIP: Could not create net namespace $gw" -	exit $ksft_skip -fi +checktool (){ +	if ! $1 > /dev/null 2>&1; then +		echo "SKIP: Could not $2" +		exit $ksft_skip +	fi +} + +checktool "nft --version" "run test without nft tool" +checktool "ip -Version" "run test without ip tool" +checktool "socat -V" "run test without socat tool" +checktool "ip netns add $ns" "create net namespace"  trap cleanup EXIT @@ -71,7 +77,8 @@ EOF  		local start=$(date +%s%3N)  		i=$((i + 10000))  		j=$((j + 1)) -		dd if=/dev/zero of=/dev/stdout bs=8k count=10000 2>/dev/null | ip netns exec "$ns" nc -w 1 -q 1 -u -p 12345 127.0.0.1 12345 > /dev/null +		# nft rule in output places each packet in a different zone. +		dd if=/dev/zero of=/dev/stdout bs=8k count=10000 2>/dev/null | ip netns exec "$ns" socat STDIN UDP:127.0.0.1:12345,sourceport=12345  		if [ $? -ne 0 ] ;then  			ret=1  			break | 
