TFO: Support compilation on systems which define TCP_FASTOPEN but not MSG_FASTOPEN

RHEL 7.0 does that, oddly

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 6400e798e24cfd53b2333cdc5b239ca278e442ce..510865c66044c8eaa57db396e5486af9c88e6b8a 100644 (file)
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -69,5 +69,9 @@ then change the 0 to 1 in the next block. */
 # define EXIM_HAVE_OPENAT
 #endif
 
+#if defined(TCP_FASTOPEN) && !defined(MSG_FASTOPEN)
+# define MSG_FASTOPEN 0x20000000
+#endif
+
 
 /* End */

diff --git a/src/src/ip.c b/src/src/ip.c
index b744f5d4c101b88e4c7fe1500d8fc3019d089c8d..a8230a149d64e76cab2ee76e09597fd95281fc79 100644 (file)
--- a/src/src/ip.c
+++ b/src/src/ip.c
@@ -224,7 +224,7 @@ callout_address = string_sprintf("[%s]:%d", address, port);
 sigalrm_seen = FALSE;
 if (timeout > 0) alarm(timeout);
 
-#ifdef TCP_FASTOPEN
+#if defined(TCP_FASTOPEN) && defined(MSG_FASTOPEN)
 /* TCP Fast Open, if the system has a cookie from a previous call to
 this peer, can send data in the SYN packet.  The peer can send data
 before it gets our ACK of its SYN,ACK - the latter is useful for