MINOR: tcp: add support for defer-accept on FreeBSD.

FreeBSD has a kernel feature (accf) and a sockopt flag similar to the
Linux's TCP_DEFER_ACCEPT to filter incoming data upon ACK. The main
difference is the filter needs to be placed when the socket actually
listens.

diff --git a/src/cfgparse-tcp.c b/src/cfgparse-tcp.c
index 4dc39d547f435786cbe01ac2896480f3c346bfd7..e7868e6bf26cec08138e5fbf83ca6343e04449fb 100644 (file)
--- a/src/cfgparse-tcp.c
+++ b/src/cfgparse-tcp.c
@@ -61,7 +61,7 @@ static int bind_parse_transparent(char **args, int cur_arg, struct proxy *px, st
 }
 #endif
 
-#ifdef TCP_DEFER_ACCEPT
+#if defined(TCP_DEFER_ACCEPT) || defined(SO_ACCEPTFILTER)
 /* parse the "defer-accept" bind keyword */
 static int bind_parse_defer_accept(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err)
 {
@@ -243,7 +243,7 @@ static int srv_parse_tcp_ut(char **args, int *cur_arg, struct proxy *px, struct
  * not enabled.
  */
 static struct bind_kw_list bind_kws = { "TCP", { }, {
-#ifdef TCP_DEFER_ACCEPT
+#if defined(TCP_DEFER_ACCEPT) || defined(SO_ACCEPTFILTER)
        { "defer-accept",  bind_parse_defer_accept, 0 }, /* wait for some data for 1 second max before doing accept */
 #endif
 #ifdef SO_BINDTODEVICE

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index a53415397f613cb3062f39786b25da6a9b3fa456..53569a99897cad78aa6d4a4712ae094709ad4658 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -708,6 +708,18 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
                goto tcp_close_return;
        }
 
+#if !defined(TCP_DEFER_ACCEPT) && defined(SO_ACCEPTFILTER)
+       /* the socket needs to listen first */
+       if (listener->options & LI_O_DEF_ACCEPT) {
+               struct accept_filter_arg accept;
+               memset(&accept, 0, sizeof(accept));
+               strcpy(accept.af_name, "dataready");
+               if (setsockopt(fd, SOL_SOCKET, SO_ACCEPTFILTER, &accept, sizeof(accept)) == -1) {
+                       msg = "cannot enable ACCEPT_FILTER";
+                       err |= ERR_WARN;
+               }
+       }
+#endif
 #if defined(TCP_QUICKACK)
        if (listener->options & LI_O_NOQUICKACK)
                setsockopt(fd, IPPROTO_TCP, TCP_QUICKACK, &zero, sizeof(zero));