Merge branch 'exim-4.96+security' into master+security

[exim.git] / test / scripts / 1090-TCP-Fast-Open / 1090

diff --git a/test/scripts/1090-TCP-Fast-Open/1090 b/test/scripts/1090-TCP-Fast-Open/1090
index d2c7b75f976fc880e198e1b3a79330d17a6245f6..840579b7a26e9015acd008f2b973fbf8eed20b32 100644 (file)
--- a/test/scripts/1090-TCP-Fast-Open/1090
+++ b/test/scripts/1090-TCP-Fast-Open/1090
@@ -30,7 +30,7 @@
 # FreeBSD: tried this setup, but we only get the banner captured 100ms after 3rd-ack:
 # #kenv net.inet.ip.fw.default_to_accept=1
 # #kldload ipfw dummynet
 # FreeBSD: tried this setup, but we only get the banner captured 100ms after 3rd-ack:
 # #kenv net.inet.ip.fw.default_to_accept=1
 # #kldload ipfw dummynet

-# #ipfw add 00097 pipe 1 ip from 127.0.0.1 to 127.0.0.1
+# #ipfw add 00097 pipe 1 ip from HOSTIPV4 to HOSTIPV4

 # #ipfw pipe 1 config delay 50ms
 # Also, the VM managed to lose the ipv4 & 6 addrs on its main interface
 # after a while - so not usable in production
 # #ipfw pipe 1 config delay 50ms
 # Also, the VM managed to lose the ipv4 & 6 addrs on its main interface
 # after a while - so not usable in production


@@ -54,7 +54,7 @@ system ("[ -e /proc/sys/net/ipv4/tcp_fastopen_blackhole_timeout_sec ] && echo 0
 # the client ACK).
 #
 # The client log => line  should have a "TFO" element.
 # the client ACK).
 #
 # The client log => line  should have a "TFO" element.

-# The server log <= line for a@test.ex  should not.
+# The server log <= line for no_cookie@test.ex  should not.

 #
 # First clear any previously-obtained cookie:
 sudo perl
 #
 # First clear any previously-obtained cookie:
 sudo perl


@@ -63,7 +63,7 @@ $_ = <INFO>;
 if (/^FreeBSD/) {
 system("sysctl net.inet.tcp.fastopen.client_enable=0"); system("sysctl net.inet.tcp.fastopen.client_enable=1");
 } else {
 if (/^FreeBSD/) {
 system("sysctl net.inet.tcp.fastopen.client_enable=0"); system("sysctl net.inet.tcp.fastopen.client_enable=1");
 } else {

-system ("ip tcp_metrics delete 127.0.0.1");
+system ("ip tcp_metrics delete HOSTIPV4");

 }
 
 ****
 }
 
 ****


@@ -73,16 +73,16 @@ system ("ip tcp_metrics delete 127.0.0.1");
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #

-exim a@test.ex
+exim no_cookie@test.ex

 Testing
 ****
 sleep 3
 #
 Testing
 ****
 sleep 3
 #

-# The server log <= line for b@test.ex  should have a "TFO" element, but
+# The server log <= line for with_cookie@test.ex  should have a "TFO" element, but

 # this will only be obtained when the above delay is inserted into the
 # loopback net path.
 #
 # this will only be obtained when the above delay is inserted into the
 # loopback net path.
 #

-exim b@test.ex
+exim with_cookie@test.ex

 Testing
 ****
 sleep 3
 Testing
 ****
 sleep 3