tidying

[exim.git] / src / src / smtp_out.c

diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c
index 62d4c7333bb26bd6f4ae9543605cf93ea5d50c54..ef2c9fdeb37a0d07e0beb7b8026b1d7ff48c00e2 100644 (file)
--- a/src/src/smtp_out.c
+++ b/src/src/smtp_out.c
@@ -149,7 +149,6 @@ struct tcp_info tinfo;
 socklen_t len = sizeof(tinfo);
 
 if (getsockopt(sock, IPPROTO_TCP, TCP_INFO, &tinfo, &len) == 0)
-  {
   switch (tcp_out_fastopen)
     {
       /* This is a somewhat dubious detection method; totally undocumented so likely
@@ -163,32 +162,32 @@ if (getsockopt(sock, IPPROTO_TCP, TCP_INFO, &tinfo, &len) == 0)
        '# echo -n "00000000-00000000-00000000-0000000" >/proc/sys/net/ipv4/tcp_fastopen_key'
       The kernel seems to be counting unack'd packets. */
 
-    case 1:
+    case TFO_ATTEMPTED:
       if (tinfo.tcpi_unacked > 1)
        {
        DEBUG(D_transport|D_v)
          debug_printf("TCP_FASTOPEN tcpi_unacked %d\n", tinfo.tcpi_unacked);
-       tcp_out_fastopen = 2;
+       tcp_out_fastopen = TFO_USED;
        }
       break;
 
-#ifdef notdef          /* This seems to always fire, meaning that we cannot tell
+#  ifdef notdef                /* This seems to always fire, meaning that we cannot tell
                        whether the server accepted data we sent.  For now assume
                        that it did. */
 
       /* If there was data-on-SYN but we had to retrasnmit it, declare no TFO */
 
-    case 2:
+    case TFO_USED:
       if (!(tinfo.tcpi_options & TCPI_OPT_SYN_DATA))
        {
        DEBUG(D_transport|D_v) debug_printf("TFO: had to retransmit\n");
-       tcp_out_fastopen = 0;
+       tcp_out_fastopen = TFO_NOT_USED;
        }
       break;
-#endif
-    }
 
-  }
+  default: break;      /* compiler quietening */
+#  endif
+    }
 # endif
 }
 #endif