diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2022-09-13 16:37:45 +1000 |
---|---|---|
committer | Stefano Brivio <sbrivio@redhat.com> | 2022-09-13 11:14:29 +0200 |
commit | 9fc476af6ebcef88e128fb681631c3a39243f4f2 (patch) | |
tree | e3fb032aaf752ddbc2bad7d01e14723a4730be67 /test/passt/udp | |
parent | af9c98af5ffc7502c6292a36ffae4913b1ce9acf (diff) | |
download | passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.gz passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.bz2 passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.lz passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.xz passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.tar.zst passt-9fc476af6ebcef88e128fb681631c3a39243f4f2.zip |
test: Simpler termination handling for UDP tests
Because UDP is connectionless we don't have an in-built end-of-stream
signal for our connectivity tests. We work around this by explicitly
adding an end marker to our sample data and killing the listening end once
it is seen.
However, socat has some built-in options - null-eof and shut-null - which
can be used to signal the end of stream with a zero-length UDP packet.
Use these to simplify how the UDP tests are implemented.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/passt/udp')
-rw-r--r-- | test/passt/udp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/test/passt/udp b/test/passt/udp index 0253a86..7d444b8 100644 --- a/test/passt/udp +++ b/test/passt/udp @@ -11,42 +11,41 @@ # Copyright (c) 2021 Red Hat GmbH # Author: Stefano Brivio <sbrivio@redhat.com> -gtools socat tee grep cat ip jq md5sum cut -htools printf dd socat tee grep cat ip jq md5sum cut +gtools socat ip jq md5sum cut +htools dd socat jq md5sum cut test UDP/IPv4: host to guest set TEMP __STATEDIR__/data -set SC_PID __STATEDIR__/socat.pid -guestb (socat -u UDP4-LISTEN:10001 STDOUT & echo $! > sc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat sc.pid)) +guestb socat -u UDP4-LISTEN:10001,null-eof OPEN:test.bin,create,trunc sleep 1 -host dd if=/dev/urandom bs=1k count=5 > __TEMP__ && printf "\nEND_OF_TEST\n" >> __TEMP__ -host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10001 +host dd if=/dev/urandom bs=1k count=5 > __TEMP__ +host socat -u OPEN:__TEMP__ UDP4:127.0.0.1:10001,shut-null guestw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] test UDP/IPv4: guest to host -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__)) +hostb socat -u UDP4-LISTEN:10003,bind=127.0.0.1,null-eof OPEN:__TEMP__,create,trunc gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' -guest socat -u OPEN:test.bin UDP4:__GW__:10003 +guest socat -u OPEN:test.bin UDP4:__GW__:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] test UDP/IPv6: host to guest -guestb (socat -u UDP6-LISTEN:10001 STDOUT & echo $! > sc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat sc.pid)) +guestb socat -u UDP6-LISTEN:10001,null-eof OPEN:test.bin,create,trunc sleep 1 -host socat -u OPEN:__TEMP__ UDP6:[::1]:10001 +host socat -u OPEN:__TEMP__ UDP6:[::1]:10001,shut-null guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] test UDP/IPv6: guest to host -hostb (socat -u UDP6-LISTEN:10003,bind=[::1] STDOUT & echo $! > __SC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __SC_PID__)) +hostb socat -u UDP6-LISTEN:10003,bind=[::1],null-eof OPEN:__TEMP__,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 socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10003 +guest socat -u OPEN:test.bin UDP6:[__GW6__%__IFNAME__]:10003,shut-null hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 check [ "__GUEST_MD5__" = "__HOST_MD5__" ] |