Merge tag 'upstream/2.3.3'

Upstream version 2.3.3

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/t_client.sh b/tests/t_client.sh
index 26df138..f34eccc 100755
--- a/tests/t_client.sh
+++ b/tests/t_client.sh
@@ -86,12 +86,12 @@ fail()
 get_ifconfig_route()
 {
     # linux / iproute2? (-> if configure got a path)
-    if [ -n "/sbin/ip" ]
+    if [ -n "/bin/ip" ]
     then
 	echo "-- linux iproute2 --"
-	/sbin/ip addr show     | grep -v valid_lft
-	/sbin/ip route show
-	/sbin/ip -o -6 route show | grep -v ' cache' | sed -e 's/expires [0-9]*sec//'
+	/bin/ip addr show     | grep -v valid_lft
+	/bin/ip route show
+	/bin/ip -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
 	return
     fi
 
diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index 189eecc..64bb5fd 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -91,7 +91,7 @@ get_ifconfig_route()
 	echo "-- linux iproute2 --"
 	@IPROUTE@ addr show     | grep -v valid_lft
 	@IPROUTE@ route show
-	@IPROUTE@ -o -6 route show | grep -v ' cache' | sed -e 's/expires [0-9]*sec//'
+	@IPROUTE@ -o -6 route show | grep -v ' cache' | sed -E -e 's/ expires [0-9]*sec//' -e 's/ (mtu|hoplimit|cwnd) [0-9]+//g' -e 's/ (rtt|rttvar) [0-9]+ms//g'
 	return
     fi