diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2016-12-02 11:59:35 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-12-04 03:36:19 +0100 |
| commit | 2f6ef4b6237ae8d2f097fc29a02665b25824c278 (patch) | |
| tree | 8b5f71d53c6ffeb209def3c84c1c0083525776cf /src/tests/netns.sh | |
| parent | hashtable: use random number each time (diff) | |
| download | wireguard-monolithic-historical-2f6ef4b6237ae8d2f097fc29a02665b25824c278.tar.xz wireguard-monolithic-historical-2f6ef4b6237ae8d2f097fc29a02665b25824c278.zip | |
tests: make sure ncat gets killed
Diffstat (limited to 'src/tests/netns.sh')
| -rwxr-xr-x | src/tests/netns.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tests/netns.sh b/src/tests/netns.sh index 4e8465c..50040fa 100755 --- a/src/tests/netns.sh +++ b/src/tests/netns.sh @@ -48,10 +48,11 @@ cleanup() { ip0 link del dev wg0 ip1 link del dev wg0 ip2 link del dev wg0 + local to_kill="$(ip netns pids $netns0) $(ip netns pids $netns1) $(ip netns pids $netns2)" + [[ -n $to_kill ]] && kill $to_kill pp ip netns del $netns1 pp ip netns del $netns2 pp ip netns del $netns0 - kill -- -$$ exit } @@ -176,14 +177,14 @@ n1 ping -W 1 -c 1 192.168.241.2 # Test that crypto-RP filter works n1 wg set wg0 peer "$pub2" allowed-ips 192.168.241.0/24 -read -r -N 1 -t 1 out < <(n1 ncat -l -u -p 1111) && [[ $out == "X" ]] & listener_pid=$! +read -r -N 1 -t 1 out < <(n1 ncat -l -u -p 1111 2>/dev/null) && [[ $out == "X" ]] & listener_pid=$! waitncatudp $netns1 n2 ncat -u 192.168.241.1 1111 <<<"X" wait $listener_pid more_specific_key="$(pp wg genkey | pp wg pubkey)" n1 wg set wg0 peer "$more_specific_key" allowed-ips 192.168.241.2/32 n2 wg set wg0 listen-port 9997 -read -r -N 1 -t 1 out < <(n1 ncat -l -u -p 1111) && [[ $out == "X" ]] & listener_pid=$! +read -r -N 1 -t 1 out < <(n1 ncat -l -u -p 1111 2>/dev/null) && [[ $out == "X" ]] & listener_pid=$! waitncatudp $netns1 n2 ncat -u 192.168.241.1 1111 <<<"X" ! wait $listener_pid || false |