diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2022-07-15 15:21:34 +1000 |
---|---|---|
committer | Stefano Brivio <sbrivio@redhat.com> | 2022-07-22 19:41:42 +0200 |
commit | 1aaa2bd189cb42a26ee411fd1652e7479d82f005 (patch) | |
tree | 56b8221eccaf1198620485593045dfbc39f41e0c /test/udp/passt | |
parent | 05dc1c65c11c05709ebde73e74d91fd29226ba9c (diff) | |
download | passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.tar passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.tar.gz passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.tar.bz2 passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.tar.lz passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.tar.xz passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.tar.zst passt-1aaa2bd189cb42a26ee411fd1652e7479d82f005.zip |
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 <david@gibson.dropbear.id.au>
[sbrivio: Fix a typo in port specification, 31337 instead of x31337]
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'test/udp/passt')
-rw-r--r-- | test/udp/passt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/test/udp/passt b/test/udp/passt index 9598d0e..ee575e0 100644 --- a/test/udp/passt +++ b/test/udp/passt @@ -11,15 +11,15 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio <sbrivio@redhat.com> -gtools nc tee grep cat ip jq md5sum cut -htools printf dd nc tee grep cat ip jq md5sum cut +gtools socat tee grep cat ip jq md5sum cut +htools printf dd socat tee grep cat ip jq md5sum cut test UDP/IPv4: host to guest temp TEMP -temp NC_PID -guestb (nc -u -q1 -4 -l 10001 & echo $! > __NC_PID__) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) +temp SC_PID +guestb (socat -u UDP4-LISTEN:10001 STDOUT & echo $! > __SC_PID__) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__ -host cat __TEMP__ | nc -u -q1 -N 127.0.0.1 10001 +host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10001 guestw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 @@ -27,27 +27,27 @@ check [ "__GUEST_MD5__" = "__HOST_MD5__" ] test UDP/IPv4: guest to host host :> __TEMP__ -hostb (nc -u -q1 -4 -l 10003 & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) +hostb (socat -u UDP4-LISTEN:10003,bind=127.0.0.1 STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -guest cat test.bin | nc -u -q1 -N __GW__ 10003 +guest socat -u OPEN:test.bin UDP4:__GW__:10003 hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] test UDP/IPv6: host to guest -guestb (nc -u -q1 -6 -l 10001 & echo $! > nc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat nc.pid)) +guestb (socat -u UDP6-LISTEN:10001 STDOUT & echo $! > sc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat sc.pid)) sleep 1 -host cat __TEMP__ | nc -u -q1 -N ::1 10001 +host socat -u OPEN:__TEMP__ UDP6:[::1]:10001 guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] test UDP/IPv6: guest to host host :> __TEMP__ -hostb (nc -u -q1 -6 -l 10003 & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) +hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) 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.bin | nc -u -q1 -N __GW6__%__IFNAME__ 10003 +guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10003 hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] |