mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
78 lines
3.1 KiB
Diff
78 lines
3.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Tue, 4 Feb 2020 22:17:29 +0100
|
|
Subject: [PATCH] wireguard: selftests: tie socket waiting to target pid
|
|
|
|
commit 88f404a9b1d75388225b1c67b6dd327cb2182777 upstream.
|
|
|
|
Without this, we wind up proceeding too early sometimes when the
|
|
previous process has just used the same listening port. So, we tie the
|
|
listening socket query to the specific pid we're interested in.
|
|
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
tools/testing/selftests/wireguard/netns.sh | 17 ++++++++---------
|
|
1 file changed, 8 insertions(+), 9 deletions(-)
|
|
|
|
--- a/tools/testing/selftests/wireguard/netns.sh
|
|
+++ b/tools/testing/selftests/wireguard/netns.sh
|
|
@@ -38,9 +38,8 @@ ip0() { pretty 0 "ip $*"; ip -n $netns0
|
|
ip1() { pretty 1 "ip $*"; ip -n $netns1 "$@"; }
|
|
ip2() { pretty 2 "ip $*"; ip -n $netns2 "$@"; }
|
|
sleep() { read -t "$1" -N 1 || true; }
|
|
-waitiperf() { pretty "${1//*-}" "wait for iperf:5201"; while [[ $(ss -N "$1" -tlp 'sport = 5201') != *iperf3* ]]; do sleep 0.1; done; }
|
|
-waitncatudp() { pretty "${1//*-}" "wait for udp:1111"; while [[ $(ss -N "$1" -ulp 'sport = 1111') != *ncat* ]]; do sleep 0.1; done; }
|
|
-waitncattcp() { pretty "${1//*-}" "wait for tcp:1111"; while [[ $(ss -N "$1" -tlp 'sport = 1111') != *ncat* ]]; do sleep 0.1; done; }
|
|
+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; }
|
|
+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; }
|
|
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;"; }
|
|
|
|
cleanup() {
|
|
@@ -119,22 +118,22 @@ tests() {
|
|
|
|
# TCP over IPv4
|
|
n2 iperf3 -s -1 -B 192.168.241.2 &
|
|
- waitiperf $netns2
|
|
+ waitiperf $netns2 $!
|
|
n1 iperf3 -Z -t 3 -c 192.168.241.2
|
|
|
|
# TCP over IPv6
|
|
n1 iperf3 -s -1 -B fd00::1 &
|
|
- waitiperf $netns1
|
|
+ waitiperf $netns1 $!
|
|
n2 iperf3 -Z -t 3 -c fd00::1
|
|
|
|
# UDP over IPv4
|
|
n1 iperf3 -s -1 -B 192.168.241.1 &
|
|
- waitiperf $netns1
|
|
+ waitiperf $netns1 $!
|
|
n2 iperf3 -Z -t 3 -b 0 -u -c 192.168.241.1
|
|
|
|
# UDP over IPv6
|
|
n2 iperf3 -s -1 -B fd00::2 &
|
|
- waitiperf $netns2
|
|
+ waitiperf $netns2 $!
|
|
n1 iperf3 -Z -t 3 -b 0 -u -c fd00::2
|
|
}
|
|
|
|
@@ -207,7 +206,7 @@ n1 ping -W 1 -c 1 192.168.241.2
|
|
n1 wg set wg0 peer "$pub2" allowed-ips 192.168.241.0/24
|
|
exec 4< <(n1 ncat -l -u -p 1111)
|
|
ncat_pid=$!
|
|
-waitncatudp $netns1
|
|
+waitncatudp $netns1 $ncat_pid
|
|
n2 ncat -u 192.168.241.1 1111 <<<"X"
|
|
read -r -N 1 -t 1 out <&4 && [[ $out == "X" ]]
|
|
kill $ncat_pid
|
|
@@ -216,7 +215,7 @@ n1 wg set wg0 peer "$more_specific_key"
|
|
n2 wg set wg0 listen-port 9997
|
|
exec 4< <(n1 ncat -l -u -p 1111)
|
|
ncat_pid=$!
|
|
-waitncatudp $netns1
|
|
+waitncatudp $netns1 $ncat_pid
|
|
n2 ncat -u 192.168.241.1 1111 <<<"X"
|
|
! read -r -N 1 -t 1 out <&4 || false
|
|
kill $ncat_pid
|