From 1aaa2bd189cb42a26ee411fd1652e7479d82f005 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 15 Jul 2022 15:21:34 +1000 Subject: tests: Use socat instead of netcat Commit 41c02e10 ("tests: Use nmap-ncat instead of openbsd netcat for pasta tests") updated the pasta tests to use the nmap version of ncat instead of the openbsd version, for greater portability. For some upcoming changes, however, we'll be wanting to use socat. "socat" can do everything "ncat" can and more, so let's move all the tests using host tools (either directly on the host or via mbuto generated images) to using socat instead. Signed-off-by: David Gibson [sbrivio: Fix a typo in port specification, 31337 instead of x31337] Signed-off-by: Stefano Brivio --- test/tcp/passt | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'test/tcp/passt') diff --git a/test/tcp/passt b/test/tcp/passt index 4baa610..6e65137 100644 --- a/test/tcp/passt +++ b/test/tcp/passt @@ -11,75 +11,75 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio -gtools nc ip jq cat md5sum cut -htools dd nc ip jq cat md5sum cut +gtools socat ip jq md5sum cut +htools dd socat ip jq md5sum cut test TCP/IPv4: host to guest: big transfer temp TEMP_BIG -guestb nc -4 -l 10001 > test_big.bin +guestb socat -u TCP4-LISTEN:10001,reuseaddr OPEN:test_big.bin,create,trunc host dd if=/dev/urandom bs=1M count=10 > __TEMP_BIG__ -host cat __TEMP_BIG__ | nc -N 127.0.0.1 10001 +host socat -u OPEN:__TEMP_BIG__ TCP4:127.0.0.1:10001 guestw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] test TCP/IPv4: guest to host: big transfer -hostb nc -4 -l 10003 > __TEMP_BIG__ +hostb socat -u TCP4-LISTEN:10003,bind=127.0.0.1,reuseaddr OPEN:__TEMP_BIG__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -guest cat test_big.bin | nc -N __GW__ 10003 +guest socat -u OPEN:test_big.bin TCP4:__GW__:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] test TCP/IPv4: host to guest: small transfer temp TEMP_SMALL -guestb nc -4 -l 10001 > test_small.bin +guestb socat -u TCP4-LISTEN:10001,reuseaddr OPEN:test_small.bin,create,trunc host dd if=/dev/urandom bs=2k count=1 > __TEMP_SMALL__ -host cat __TEMP_SMALL__ | nc -N 127.0.0.1 10001 +host socat -u OPEN:__TEMP_SMALL__ TCP4:127.0.0.1:10001 guestw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 gout GUEST_MD5_SMALL md5sum test_small.bin | cut -d' ' -f1 check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] test TCP/IPv4: guest to host: small transfer -hostb nc -4 -l 10003 > __TEMP_SMALL__ +hostb socat -u TCP4-LISTEN:10003,bind=127.0.0.1,reuseaddr OPEN:__TEMP_SMALL__,create,trunc sleep 1 -guest cat test_small.bin | nc -N __GW__ 10003 +guest socat -u OPEN:test_small.bin TCP4:__GW__:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] test TCP/IPv6: host to guest: big transfer -guestb nc -6 -l 10001 > test_big.bin +guestb socat -u TCP6-LISTEN:10001,reuseaddr OPEN:test_big.bin,create,trunc sleep 1 -host cat __TEMP_BIG__ | nc -N ::1 10001 +host socat -u OPEN:__TEMP_BIG__ TCP6:[::1]:10001 guestw gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] test TCP/IPv6: guest to host: big transfer -hostb nc -6 -l 10003 > __TEMP_BIG__ +hostb socat -u TCP6-LISTEN:10003,bind=[::1],reuseaddr OPEN:__TEMP_BIG__,create,trunc gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' -guest cat test_big.bin | nc -N __GW6__%__IFNAME__ 10003 +guest socat -u OPEN:test_big.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 check [ "__GUEST_MD5_BIG__" = "__HOST_MD5_BIG__" ] test TCP/IPv6: host to guest: small transfer -guestb nc -6 -l 10001 > test_small.bin +guestb socat -u TCP6-LISTEN:10001,reuseaddr OPEN:test_small.bin,create,trunc sleep 1 -host cat __TEMP_SMALL__ | nc -N ::1 10001 +host socat -u OPEN:__TEMP_SMALL__ TCP6:[::1]:10001 guestw gout GUEST_MD5_SMALL md5sum test_small.bin | cut -d' ' -f1 check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] test TCP/IPv6: guest to host: small transfer -hostb nc -6 -l 10003 > __TEMP_SMALL__ +hostb socat -u TCP6-LISTEN:10003,bind=[::1],reuseaddr OPEN:__TEMP_SMALL__,create,trunc sleep 1 -guest cat test_small.bin | nc -N __GW6__%__IFNAME__ 10003 +guest socat -u OPEN:test_small.bin TCP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 check [ "__GUEST_MD5_SMALL__" = "__HOST_MD5_SMALL__" ] -- cgit v1.2.3