Stop recreating hashmaps every hour, move garbage collection code related to local...

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index b0fce7b5b4d475cac50b713f269ab7316fae2476..3a44736978cc784615d0828524d756ff809f09b9 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -1,17 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Core */
 
 #include "inspircd.h"
 #include "socket.h"
@@ -33,6 +38,22 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        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
+        * 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;
@@ -69,7 +90,7 @@ void ListenSocket::AcceptInternal()
        socklen_t length = sizeof(client);
        int incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length);
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensoket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
+       ServerInstance->Logs->Log("SOCKET",DEBUG,"HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
        if (incomingSockfd < 0)
        {
                ServerInstance->stats->statsRefused++;
@@ -121,16 +142,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));
                }
        }