Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 0ea84448c5d40d53477e8b379c98793233969700..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;
@@ -75,7 +77,8 @@ ListenSocket::~ListenSocket()
        {
                ServerInstance->SE->DelFd(this);
                ServerInstance->Logs->Log("SOCKET", DEBUG,"Shut down listener on fd %d", this->fd);
-               if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
+               ServerInstance->SE->Shutdown(this, 2);
+               if (ServerInstance->SE->Close(this) != 0)
                        ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
                this->fd = -1;
        }
@@ -142,16 +145,14 @@ void ListenSocket::AcceptInternal()
                {
                        // recreate as a sockaddr_in using the IPv4 IP
                        uint16_t sport = client.in6.sin6_port;
-                       uint32_t addr = *reinterpret_cast<uint32_t*>(client.in6.sin6_addr.s6_addr + 12);
                        client.in4.sin_family = AF_INET;
                        client.in4.sin_port = sport;
-                       client.in4.sin_addr.s_addr = addr;
+                       memcpy(&client.in4.sin_addr.s_addr, client.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t));
 
                        sport = server.in6.sin6_port;
-                       addr = *reinterpret_cast<uint32_t*>(server.in6.sin6_addr.s6_addr + 12);
                        server.in4.sin_family = AF_INET;
                        server.in4.sin_port = sport;
-                       server.in4.sin_addr.s_addr = addr;
+                       memcpy(&server.in4.sin_addr.s_addr, server.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t));
                }
        }