m_showwhois Require 2 parameters for WHOISNOTICE

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

diff --git a/src/socket.cpp b/src/socket.cpp
index a04523ddf0b68c6bf814fd04a5a3df539374ad1c..6fc7b13f8fc967e25bf248d8c08137ac9dd1b187 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;
@@ -302,7 +313,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);
        }
@@ -338,8 +349,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