X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Flistensocket.cpp;h=df27a9c48bc5fb5827f5966a44b17fbfc4e47c6b;hb=a3cdff95f4120526d0944a6bb6b3a96136466aa8;hp=b0fce7b5b4d475cac50b713f269ab7316fae2476;hpb=235864add961270140c956647d783fa79b5f7120;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index b0fce7b5b..df27a9c48 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -11,8 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "socket.h"
 #include "socketengine.h"
@@ -33,6 +31,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 +83,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++;