Merge pull request #109 from Justasic/insp20

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 6ae598ad3bea72738ae92298b850bcc8657eef4b..0ea84448c5d40d53477e8b379c98793233969700 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++;
@@ -78,7 +99,10 @@ void ListenSocket::AcceptInternal()
 
        socklen_t sz = sizeof(server);
        if (getsockname(incomingSockfd, &server.sa, &sz))
+       {
                ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+               irc::sockets::aptosa(bind_addr, bind_port, server);
+       }
 
        /*
         * XXX -