Merge branch '4.next'

[exim.git] / test / scripts / 4058-pipe-conn-tfo / 4058

diff --git a/test/scripts/4058-pipe-conn-tfo/4058 b/test/scripts/4058-pipe-conn-tfo/4058
index 3a388a2d924f84e39f30b8e235dcdb47cd543478..999cfad4a65c01e4801cdf776cf9498cc349c095 100644 (file)
--- a/test/scripts/4058-pipe-conn-tfo/4058
+++ b/test/scripts/4058-pipe-conn-tfo/4058
@@ -1,14 +1,16 @@
 # Early-pipelining, with TFO
 #
+# NOTE: ensure that TFO is fully enabled in the kernel.
+# For linux: sysctl net.ipv4.tcp_fastopen=3
+# 
 #
 # Packet delays so we can see TFO operational in packet captures
-sudo perl
-system ("tc qdisc add dev lo root netem delay 50ms");
-****
-#
 # Wipe any stored TFO cookie, to start from known state.
+# Disable TFO blackhole-detection as we seem to be running afoul of that
 sudo perl
-system ("ip tcp_metrics delete 127.0.0.1");
+system ("tc qdisc add dev lo root netem delay 50ms");
+system ("ip tcp_metrics delete HOSTIPV4");
+system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 0 > /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec");
 ****
 #
 #
@@ -73,6 +75,7 @@ killdaemon
 #
 sudo perl
 system ("tc qdisc delete dev lo root");
+system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 3600 > /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec");
 ****
 #
 no_msglog_check