Show a better warning when certtool/openssl are missing.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 07ae491e0acfb1ff41df94b2a291bd3281f6ebe0..ae11c3b48238b3155cfb2b52c9de0f2dac97ecb2 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -33,11 +33,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 +43,19 @@ 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);
+
        if (rv < 0)
        {
                int errstore = errno;