Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 3ee9961935d2c1b8260c131e6180c6cd30ce2523..e73d01af9c37ed37fbdd1909b95dd83dbba0e5af 100644 (file)
--- 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"
@@ -95,6 +105,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
                        {
                                if ((**n).bind_desc == bind_readable)
                                {
+                                       (*n)->bind_tag = tag; // Replace tag, we know addr and port match, but other info (type, ssl) may not
                                        skip = true;
                                        old_ports.erase(n);
                                        break;
@@ -206,8 +217,6 @@ bool irc::sockets::satoap(const irc::sockets::sockaddrs& sa, std::string& addr,
        return !addr.empty();
 }
 
-static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
-
 std::string irc::sockets::sockaddrs::str() const
 {
        char buffer[MAXBUF];
@@ -239,38 +248,55 @@ 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;
+       unsigned char target_byte;
        cidr.type = sa.sa.sa_family;
+
+       memset(cidr.bits, 0, sizeof(cidr.bits));
+
        if (cidr.type == AF_INET)
        {
+               target_byte = sizeof(sa.in4.sin_addr);
                base = (unsigned char*)&sa.in4.sin_addr;
                if (range > 32)
                        range = 32;
        }
        else if (cidr.type == AF_INET6)
        {
+               target_byte = sizeof(sa.in6.sin6_addr);
                base = (unsigned char*)&sa.in6.sin6_addr;
                if (range > 128)
                        range = 128;
        }
        else
        {
-               base = (unsigned char*)"";
-               range = 0;
+               cidr.length = 0;
+               return;
        }
        cidr.length = range;
        unsigned int border = range / 8;
        unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF;
-       for(unsigned int i=0; i < 16; i++)
+       for(unsigned int i=0; i < target_byte; i++)
        {
                if (i < border)
                        cidr.bits[i] = base[i];
                else if (i == border)
                        cidr.bits[i] = base[i] & bitmask;
                else
-                       cidr.bits[i] = 0;
+                       return;
        }
 }
 
@@ -291,7 +317,7 @@ irc::sockets::cidr_mask::cidr_mask(const std::string& mask)
        }
        else
        {
-               int range = atoi(mask.substr(bits_chars + 1).c_str());
+               int range = ConvToInt(mask.substr(bits_chars + 1));
                irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa);
                sa2cidr(*this, sa, range);
        }
@@ -327,8 +353,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