TFO: Support compilation on Linus platforms which define TCP_FASTOPEN but not MSG_FAS...

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 510865c66044c8eaa57db396e5486af9c88e6b8a..cc1cef99be849c10d487aef94e5a767f02d95b38 100644 (file)
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -69,6 +69,8 @@ then change the 0 to 1 in the next block. */
 # define EXIM_HAVE_OPENAT
 #endif
 
 # define EXIM_HAVE_OPENAT
 #endif
 

+#include <netinet/tcp.h>       /* for TCP_FASTOPEN */
+#include <sys/socket.h>                /* for MSG_FASTOPEN */

 #if defined(TCP_FASTOPEN) && !defined(MSG_FASTOPEN)
 # define MSG_FASTOPEN 0x20000000
 #endif
 #if defined(TCP_FASTOPEN) && !defined(MSG_FASTOPEN)
 # define MSG_FASTOPEN 0x20000000
 #endif

diff --git a/test/scripts/2100-OpenSSL/2152 b/test/scripts/2100-OpenSSL/2152
index 329e4205106a3b354c5dc07a2f48f36baad128dc..12a482a9313c22590dc07d2a80a97ab4941b1640 100644 (file)
--- a/test/scripts/2100-OpenSSL/2152
+++ b/test/scripts/2100-OpenSSL/2152
@@ -2,7 +2,7 @@
 #
 # If all works you'll not see any difference.  To enable in the
 # kernel, 'sudo sh -c "echo 3 > /proc/sys/net/ipv4/tcp_fastopen"'.
 #
 # If all works you'll not see any difference.  To enable in the
 # kernel, 'sudo sh -c "echo 3 > /proc/sys/net/ipv4/tcp_fastopen"'.

-# A packet capture on the loopback interface will show the TFU
+# A packet capture on the loopback interface will show the TFO

 # option on the SYN, but the fast-output SMTP banner will not
 # be seen unless you also deliberately emulate a long path:
 # 'sudo tc qdisc add dev lo root netem delay 100ms'
 # option on the SYN, but the fast-output SMTP banner will not
 # be seen unless you also deliberately emulate a long path:
 # 'sudo tc qdisc add dev lo root netem delay 100ms'