git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From d95179eade4bc805455dd5e6617db5e387004d13 Mon Sep 17 00:00:00 2001
   2 From: "Jason A. Donenfeld" <Jason@zx2c4.com>
   3 Date: Tue, 4 Feb 2020 22:17:29 +0100
   4 Subject: [PATCH 085/124] wireguard: selftests: tie socket waiting to target
   5  pid
   6
   7 commit 88f404a9b1d75388225b1c67b6dd327cb2182777 upstream.
   8
   9 Without this, we wind up proceeding too early sometimes when the
  10 previous process has just used the same listening port. So, we tie the
  11 listening socket query to the specific pid we're interested in.
  12
  13 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  14 Signed-off-by: David S. Miller <davem@davemloft.net>
  15 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
  16 ---
  17  tools/testing/selftests/wireguard/netns.sh | 17 ++++++++---------
  18  1 file changed, 8 insertions(+), 9 deletions(-)
  19
  20 --- a/tools/testing/selftests/wireguard/netns.sh
  21 +++ b/tools/testing/selftests/wireguard/netns.sh
  22 @@ -38,9 +38,8 @@ ip0() { pretty 0 "ip $*"; ip -n $netns0
  23  ip1() { pretty 1 "ip $*"; ip -n $netns1 "$@"; }
  24  ip2() { pretty 2 "ip $*"; ip -n $netns2 "$@"; }
  25  sleep() { read -t "$1" -N 1 || true; }
  26 -waitiperf() { pretty "${1//*-}" "wait for iperf:5201"; while [[ $(ss -N "$1" -tlp 'sport = 5201') != *iperf3* ]]; do sleep 0.1; done; }
  27 -waitncatudp() { pretty "${1//*-}" "wait for udp:1111"; while [[ $(ss -N "$1" -ulp 'sport = 1111') != *ncat* ]]; do sleep 0.1; done; }
  28 -waitncattcp() { pretty "${1//*-}" "wait for tcp:1111"; while [[ $(ss -N "$1" -tlp 'sport = 1111') != *ncat* ]]; do sleep 0.1; done; }
  29 +waitiperf() { pretty "${1//*-}" "wait for iperf:5201 pid $2"; while [[ $(ss -N "$1" -tlpH 'sport = 5201') != *\"iperf3\",pid=$2,fd=* ]]; do sleep 0.1; done; }
  30 +waitncatudp() { pretty "${1//*-}" "wait for udp:1111 pid $2"; while [[ $(ss -N "$1" -ulpH 'sport = 1111') != *\"ncat\",pid=$2,fd=* ]]; do sleep 0.1; done; }
  31  waitiface() { pretty "${1//*-}" "wait for $2 to come up"; ip netns exec "$1" bash -c "while [[ \$(< \"/sys/class/net/$2/operstate\") != up ]]; do read -t .1 -N 0 || true; done;"; }
  32
  33  cleanup() {
  34 @@ -119,22 +118,22 @@ tests() {
  35
  36         # TCP over IPv4
  37         n2 iperf3 -s -1 -B 192.168.241.2 &
  38 -       waitiperf $netns2
  39 +       waitiperf $netns2 $!
  40         n1 iperf3 -Z -t 3 -c 192.168.241.2
  41
  42         # TCP over IPv6
  43         n1 iperf3 -s -1 -B fd00::1 &
  44 -       waitiperf $netns1
  45 +       waitiperf $netns1 $!
  46         n2 iperf3 -Z -t 3 -c fd00::1
  47
  48         # UDP over IPv4
  49         n1 iperf3 -s -1 -B 192.168.241.1 &
  50 -       waitiperf $netns1
  51 +       waitiperf $netns1 $!
  52         n2 iperf3 -Z -t 3 -b 0 -u -c 192.168.241.1
  53
  54         # UDP over IPv6
  55         n2 iperf3 -s -1 -B fd00::2 &
  56 -       waitiperf $netns2
  57 +       waitiperf $netns2 $!
  58         n1 iperf3 -Z -t 3 -b 0 -u -c fd00::2
  59  }
  60
  61 @@ -207,7 +206,7 @@ n1 ping -W 1 -c 1 192.168.241.2
  62  n1 wg set wg0 peer "$pub2" allowed-ips 192.168.241.0/24
  63  exec 4< <(n1 ncat -l -u -p 1111)
  64  ncat_pid=$!
  65 -waitncatudp $netns1
  66 +waitncatudp $netns1 $ncat_pid
  67  n2 ncat -u 192.168.241.1 1111 <<<"X"
  68  read -r -N 1 -t 1 out <&4 && [[ $out == "X" ]]
  69  kill $ncat_pid
  70 @@ -216,7 +215,7 @@ n1 wg set wg0 peer "$more_specific_key"
  71  n2 wg set wg0 listen-port 9997
  72  exec 4< <(n1 ncat -l -u -p 1111)
  73  ncat_pid=$!
  74 -waitncatudp $netns1
  75 +waitncatudp $netns1 $ncat_pid
  76  n2 ncat -u 192.168.241.1 1111 <<<"X"
  77  ! read -r -N 1 -t 1 out <&4 || false
  78  kill $ncat_pid