m_spanningtree Remove SpanningTreeUtilities* fields and parameters

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index f875bc6465c2c262a6bbbb6bd4a5f97d414717eb..9b69b53ff3a3fc35aec3fff81c2bd3bfc6721b1a 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -21,10 +21,7 @@
 #include "inspircd.h"
 #include "socket.h"
 #include "socketengine.h"
-
-#ifdef USE_TCP_DEFER_ACCEPT
 #include <netinet/tcp.h>
-#endif
 
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
        : bind_tag(tag)
@@ -37,6 +34,24 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        if (this->fd == -1)
                return;
 
+#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
+        * allow for simpler configuration on dual-stack hosts. Otherwise, if it
+        * is "::" or an IPv6 address, disable support so that an IPv4 bind will
+        * work on the port (by us or another application).
+        */
+       if (bind_to.sa.sa_family == AF_INET6)
+       {
+               std::string addr = tag->getString("address");
+               /* 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)
@@ -45,9 +60,9 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        int timeout = tag->getInt("defer", 0);
        if (timeout && !rv)
        {
-#ifdef USE_TCP_DEFER_ACCEPT
+#if defined TCP_DEFER_ACCEPT
                setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, sizeof(timeout));
-#elif defined USE_SO_ACCEPTFILTER
+#elif defined SO_ACCEPTFILTER
                struct accept_filter_arg afa;
                memset(&afa, 0, sizeof(afa));
                strcpy(afa.af_name, "dataready");
@@ -55,22 +70,6 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 #endif
        }
 
-#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
-        * allow for simpler configuration on dual-stack hosts. Otherwise, if it
-        * is "::" or an IPv6 address, disable support so that an IPv4 bind will
-        * work on the port (by us or another application).
-        */
-       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));
-               // errors ignored intentionally
-       }
-#endif
-
        if (rv < 0)
        {
                int errstore = errno;