Logging: restrict TFO client-side to Linux

The detection method depends on a getsockopt struct member apparently
not supported by FreeBSD (at least).  Other platforms status unknown.

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index e57192e582a3a266b174d3f80568f409bf973295..8ea1708bd107a2f9caa60c1e2d24e81b2f6cbdf8 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -49,7 +49,8 @@ Version 4.90
 
 12. TCP Fast Open logging.  As a server, logs when the SMTP banner was sent
     while still in SYN_RECV state; as a client logs when the connection
-    is opened with a TFO cookie.
+    is opened with a TFO cookie.  Support varies between platforms
+    (Linux does both. FreeBSD server only, others unknown).
 
 
 Version 4.89

diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index 57034649c6909e7422f724caad23caf8031c5704..f6d35772b73ddc666b5e694861d4f3c55994f586 100644 (file)
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -72,11 +72,14 @@ then change the 0 to 1 in the next block. */
 # define EXIM_HAVE_OPENAT
 #endif
 
+/* TCP Fast Open support */
+
 #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
+#define EXIM_HAVE_TCPI_UNACKED
 
 
 /* End */

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index d5bf262beead4813f5f782bb9373f68ba71ead81..ee39cb2fb4769f2aef85e1b6091418563c196d54 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -144,7 +144,7 @@ return TRUE;
 static void
 tfo_out_check(int sock)
 {
-# ifdef TCP_INFO
+# if defined(TCP_INFO) && defined(EXIM_HAVE_TCPI_UNACKED)
 struct tcp_info tinfo;
 socklen_t len = sizeof(tinfo);