Move stuff around a bit:

[user/henk/code/inspircd.git] / src / listensocket.cpp

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 466b91c8bb56643ae40a170f9f617833eb217971..ca518c59e429417ca157a24b917587682c882735 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -22,6 +22,10 @@
 #include "socket.h"
 #include "socketengine.h"
 
+#ifndef _WIN32
+#include <netinet/tcp.h>
+#endif
+
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
        : bind_tag(tag)
 {
@@ -33,11 +37,6 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        if (this->fd == -1)
                return;
 
-       ServerInstance->SE->SetReuse(fd);
-       int rv = ServerInstance->SE->Bind(this->fd, bind_to);
-       if (rv >= 0)
-               rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
-
 #ifdef IPV6_V6ONLY
        /* This OS supports IPv6 sockets that can also listen for IPv4
         * connections. If our address is "*" or empty, enable both v4 and v6 to
@@ -48,12 +47,32 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        if (bind_to.sa.sa_family == AF_INET6)
        {
                std::string addr = tag->getString("address");
-               const char enable = (addr.empty() || addr == "*") ? 0 : 1;
-               setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &enable, sizeof(enable));
+               /* This must be >= sizeof(DWORD) on Windows */
+               const int enable = (addr.empty() || addr == "*") ? 0 : 1;
+               /* This must be before bind() */
+               setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&enable), sizeof(enable));
                // errors ignored intentionally
        }
 #endif
 
+       ServerInstance->SE->SetReuse(fd);
+       int rv = ServerInstance->SE->Bind(this->fd, bind_to);
+       if (rv >= 0)
+               rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
+
+       int timeout = tag->getInt("defer", 0);
+       if (timeout && !rv)
+       {
+#if defined TCP_DEFER_ACCEPT
+               setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, sizeof(timeout));
+#elif defined SO_ACCEPTFILTER
+               struct accept_filter_arg afa;
+               memset(&afa, 0, sizeof(afa));
+               strcpy(afa.af_name, "dataready");
+               setsockopt(fd, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
+#endif
+       }
+
        if (rv < 0)
        {
                int errstore = errno;