X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocket.cpp;h=98ff3e00cccf80146eec50d8e3f39336f0978bf2;hb=16c80276ea6cba0d36da6f79a0fe7004b0e6f0ea;hp=0ceb40330650f1ca9668aaa020190df05b956f0b;hpb=d29ca254a4a9062ecaffe9395454f3a654d4e06a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socket.cpp b/src/socket.cpp
index 0ceb40330..98ff3e00c 100644
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | 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) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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/>.
  */
 
+
 #include "inspircd.h"
 #include "socket.h"
 #include "socketengine.h"
@@ -145,13 +155,16 @@ bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::socka
 	memset(&sa, 0, sizeof(sa));
 	if (addr.empty() || addr.c_str()[0] == '*')
 	{
-#ifdef IPV6
-		sa.in6.sin6_family = AF_INET6;
-		sa.in6.sin6_port = htons(port);
-#else
-		sa.in4.sin_family = AF_INET;
-		sa.in4.sin_port = htons(port);
-#endif
+		if (ServerInstance->Config->WildcardIPv6)
+		{
+			sa.in6.sin6_family = AF_INET6;
+			sa.in6.sin6_port = htons(port);
+		}
+		else
+		{
+			sa.in4.sin_family = AF_INET;
+			sa.in4.sin_port = htons(port);
+		}
 		return true;
 	}
 	else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0)
@@ -210,35 +223,17 @@ std::string irc::sockets::sockaddrs::str() const
 	char buffer[MAXBUF];
 	if (sa.sa_family == AF_INET)
 	{
-#ifndef IPV6
-		if (in4.sin_addr.s_addr == 0)
-		{
-			sprintf(buffer, "*:%u", ntohs(in4.sin_port));
-		}
-		else
-#endif
-		{
-			const uint8_t* bits = reinterpret_cast<const uint8_t*>(&in4.sin_addr);
-			sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port));
-		}
+		const uint8_t* bits = reinterpret_cast<const uint8_t*>(&in4.sin_addr);
+		sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port));
 	}
 	else if (sa.sa_family == AF_INET6)
 	{
-#ifdef IPV6
-		if (!memcmp(all_zero, &in6.sin6_addr, 16))
-		{
-			sprintf(buffer, "*:%u", ntohs(in6.sin6_port));
-		}
-		else
-#endif
-		{
-			buffer[0] = '[';
-			if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10))
-				return "<unknown>"; // should never happen, buffer is large enough
-			int len = strlen(buffer);
-			// no need for snprintf, buffer has at least 9 chars left, max short len = 5
-			sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port));
-		}
+		buffer[0] = '[';
+		if (!inet_ntop(AF_INET6, &in6.sin6_addr, buffer+1, MAXBUF - 10))
+			return "<unknown>"; // should never happen, buffer is large enough
+		int len = strlen(buffer);
+		// no need for snprintf, buffer has at least 9 chars left, max short len = 5
+		sprintf(buffer + len, "]:%u", ntohs(in6.sin6_port));
 	}
 	else
 		return "<unknown>";
@@ -254,6 +249,17 @@ int irc::sockets::sockaddrs::sa_size() const
 	return 0;
 }
 
+bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const
+{
+	if (sa.sa_family != other.sa.sa_family)
+		return false;
+	if (sa.sa_family == AF_INET)
+		return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr);
+	if (sa.sa_family == AF_INET6)
+		return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16);
+	return !memcmp(this, &other, sizeof(*this));
+}
+
 static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, int range)
 {
 	const unsigned char* base;
@@ -331,7 +337,7 @@ std::string irc::sockets::cidr_mask::str() const
 	else
 		return "";
 	memcpy(base, bits, len);
-	return sa.addr() + "/" + ConvToStr(length);
+	return sa.addr() + "/" + ConvToStr((int)length);
 }
 
 bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const
@@ -342,8 +348,11 @@ bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const
 
 bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const
 {
-	return type < other.type || length < other.length ||
-		memcmp(bits, other.bits, 16) < 0;
+	if (type != other.type)
+		return type < other.type;
+	if (length != other.length)
+		return length < other.length;
+	return memcmp(bits, other.bits, 16) < 0;
 }
 
 bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const