]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/socket.cpp
Convert the ISO 8859-2 nationalchars files to codepage configs.
[user/henk/code/inspircd.git] / src / socket.cpp
index e32bda90168358ac2d09c66d7b94c0c26cb2069f..a6bfcdb2e33a1b9d651b22ecd78d45e7c4b81351 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2011 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007 John Brooks <special@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <brain@inspircd.org>
  *
- * 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"
-#include "socketengine.h"
-using irc::sockets::sockaddrs;
 
-/** This will bind a socket to a port. It works for UDP/TCP.
- * It can only bind to IP addresses, if you wish to bind to hostnames
- * you should first resolve them using class 'Resolver'.
- */
-bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
+bool InspIRCd::BindPort(ConfigTag* tag, const irc::sockets::sockaddrs& sa, std::vector<ListenSocket*>& old_ports)
 {
-       sockaddrs servaddr;
-       int ret;
-
-       if (*addr == '*')
-               addr = "";
-
-       if (*addr)
-       {
-               irc::sockets::aptosa(addr, port, &servaddr);
-       }
-       else
+       for (std::vector<ListenSocket*>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
        {
-               memset(&servaddr, 0, sizeof(servaddr));
-               if (port == -1)
-               {
-                       /* Port -1: Means UDP IPV4 port binding - Special case
-                        * used by DNS engine.
-                        */
-                       servaddr.in4.sin_family = AF_INET;
-               }
-               else
+               if ((**n).bind_sa == sa)
                {
-                       /* No address */
-#ifdef IPV6
-                       /* Default to ipv6 bind to all */
-                       servaddr.in6.sin6_family = AF_INET6;
-                       servaddr.in6.sin6_port = htons(port);
-#else
-                       /* Bind ipv4 to all */
-                       servaddr.in4.sin_family = AF_INET;
-                       servaddr.in4.sin_port = htons(port);
-#endif
+                       // Replace tag, we know addr and port match, but other info (type, ssl) may not.
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Replacing listener on %s from old tag at %s with new tag from %s",
+                               sa.str().c_str(), (*n)->bind_tag->getTagLocation().c_str(), tag->getTagLocation().c_str());
+                       (*n)->bind_tag = tag;
+                       (*n)->ResetIOHookProvider();
+
+                       old_ports.erase(n);
+                       return true;
                }
        }
-       ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
 
-       if (ret < 0)
+       ListenSocket* ll = new ListenSocket(tag, sa);
+       if (!ll->HasFd())
        {
+               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Failed to listen on %s from tag at %s: %s",
+                       sa.str().c_str(), tag->getTagLocation().c_str(), strerror(errno));
+               delete ll;
                return false;
        }
-       else
+
+       ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Added a listener on %s from tag at %s", sa.str().c_str(), tag->getTagLocation().c_str());
+       ports.push_back(ll);
+       return true;
+}
+
+size_t InspIRCd::BindPorts(FailedPortList& failed_ports)
+{
+       size_t bound = 0;
+       std::vector<ListenSocket*> old_ports(ports.begin(), ports.end());
+
+       ConfigTagList tags = ServerInstance->Config->ConfTags("bind");
+       for (ConfigIter i = tags.first; i != tags.second; ++i)
        {
-               if (dolisten)
+               ConfigTag* tag = i->second;
+
+               // Are we creating a TCP/IP listener?
+               const std::string address = tag->getString("address");
+               const std::string portlist = tag->getString("port");
+               if (!address.empty() || !portlist.empty())
                {
-                       if (SE->Listen(sockfd, Config->MaxConn) == -1)
+                       // InspIRCd supports IPv4 and IPv6 natively; no 4in6 required.
+                       if (strncasecmp(address.c_str(), "::ffff:", 7) == 0)
+                               this->Logs->Log("SOCKET", LOG_DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+
+                       // A TCP listener with no ports is not very useful.
+                       if (portlist.empty())
+                               this->Logs->Log("SOCKET", LOG_DEFAULT, "TCP listener on %s at %s has no ports specified!",
+                                       address.empty() ? "*" : address.c_str(), tag->getTagLocation().c_str());
+
+                       irc::portparser portrange(portlist, false);
+                       for (int port; (port = portrange.GetToken()); )
                        {
-                               this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
-                               return false;
+                               irc::sockets::sockaddrs bindspec;
+                               if (!irc::sockets::aptosa(address, port, bindspec))
+                                       continue;
+
+                               if (!BindPort(tag, bindspec, old_ports))
+                                       failed_ports.push_back(FailedPort(errno, bindspec, tag));
+                               else
+                                       bound++;
                        }
-                       else
+                       continue;
+               }
+
+#ifndef _WIN32
+               // Are we creating a UNIX listener?
+               const std::string path = tag->getString("path");
+               if (!path.empty())
+               {
+                       // Expand the path relative to the config directory.
+                       const std::string fullpath = ServerInstance->Config->Paths.PrependRuntime(path);
+
+                       // UNIX socket paths are length limited to less than PATH_MAX.
+                       irc::sockets::sockaddrs bindspec;
+                       if (fullpath.length() > std::min(ServerInstance->Config->Limits.MaxHost, sizeof(bindspec.un.sun_path) - 1))
                        {
-                               this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
-                               SE->NonBlocking(sockfd);
-                               return true;
+                               this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path that is too long!",
+                                       fullpath.c_str(), tag->getTagLocation().c_str());
+                               continue;
                        }
+
+                       // Check for characters which are problematic in the IRC message format.
+                       if (fullpath.find_first_of("\n\r\t!@: ") != std::string::npos)
+                       {
+                               this->Logs->Log("SOCKET", LOG_DEFAULT, "UNIX listener on %s at %s specified a path containing invalid characters!",
+                                       fullpath.c_str(), tag->getTagLocation().c_str());
+                               continue;
+                       }
+
+                       irc::sockets::untosa(fullpath, bindspec);
+                       if (!BindPort(tag, bindspec, old_ports))
+                               failed_ports.push_back(FailedPort(errno, bindspec, tag));
+                       else
+                               bound++;
                }
-               else
+#endif
+       }
+
+       std::vector<ListenSocket*>::iterator n = ports.begin();
+       for (std::vector<ListenSocket*>::iterator o = old_ports.begin(); o != old_ports.end(); ++o)
+       {
+               while (n != ports.end() && *n != *o)
+                       n++;
+               if (n == ports.end())
                {
-                       this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
-                       return true;
+                       this->Logs->Log("SOCKET", LOG_DEFAULT, "Port bindings slipped out of vector, aborting close!");
+                       break;
                }
+
+               this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.",
+                       (**n).bind_sa.str().c_str());
+               delete *n;
+
+               // this keeps the iterator valid, pointing to the next element
+               n = ports.erase(n);
        }
+
+       return bound;
 }
 
-// Open a TCP Socket
-int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
+bool irc::sockets::aptosa(const std::string& addr, int port, irc::sockets::sockaddrs& sa)
 {
-       int sockfd;
-       int on = 1;
-       addr = addr;
-       struct linger linger = { 0, 0 };
-       if (!*addr)
+       memset(&sa, 0, sizeof(sa));
+       if (addr.empty() || addr.c_str()[0] == '*')
        {
-#ifdef IPV6
-               sockfd = socket (PF_INET6, socktype, 0);
-               if (sockfd < 0)
-#endif
-                       sockfd = socket (PF_INET, socktype, 0);
+               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 (strchr(addr,':'))
-               sockfd = socket (PF_INET6, socktype, 0);
-       else
-               sockfd = socket (PF_INET, socktype, 0);
-
-       if (sockfd < 0)
+       else if (inet_pton(AF_INET, addr.c_str(), &sa.in4.sin_addr) > 0)
        {
-               return ERROR;
+               sa.in4.sin_family = AF_INET;
+               sa.in4.sin_port = htons(port);
+               return true;
        }
-       else
+       else if (inet_pton(AF_INET6, addr.c_str(), &sa.in6.sin6_addr) > 0)
        {
-               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
-               /* This is BSD compatible, setting l_onoff to 0 is *NOT* http://web.irc.org/mla/ircd-dev/msg02259.html */
-               linger.l_onoff = 1;
-               linger.l_linger = 1;
-               setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
-               return (sockfd);
+               sa.in6.sin6_family = AF_INET6;
+               sa.in6.sin6_port = htons(port);
+               return true;
        }
+       return false;
+}
+
+bool irc::sockets::untosa(const std::string& path, irc::sockets::sockaddrs& sa)
+{
+       memset(&sa, 0, sizeof(sa));
+       if (path.length() >= sizeof(sa.un.sun_path))
+               return false;
+
+       sa.un.sun_family = AF_UNIX;
+       memcpy(&sa.un.sun_path, path.c_str(), path.length() + 1);
+       return true;
 }
 
-// XXX: it would be VERY nice to genericize this so all listen stuff (server/client) could use the one function. -- w00t
-int InspIRCd::BindPorts(FailedPortList &failed_ports)
+bool irc::sockets::isunix(const std::string& file)
 {
-       char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF], Desc[MAXBUF];
-       int bound = 0;
-       bool started_with_nothing = (ports.size() == 0);
-       std::vector<std::pair<std::string, int> > old_ports;
+#ifndef _WIN32
+       struct stat sb;
+       if (stat(file.c_str(), &sb) == 0 && S_ISSOCK(sb.st_mode))
+               return true;
+#endif
+       return false;
+}
 
-       /* XXX: Make a copy of the old ip/port pairs here */
-       for (std::vector<ListenSocketBase *>::iterator o = ports.begin(); o != ports.end(); ++o)
-               old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
 
-       for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
+int irc::sockets::sockaddrs::family() const
+{
+       return sa.sa_family;
+}
+
+int irc::sockets::sockaddrs::port() const
+{
+       switch (family())
        {
-               Config->ConfValue("bind", "port", count, configToken, MAXBUF);
-               Config->ConfValue("bind", "address", count, Addr, MAXBUF);
-               Config->ConfValue("bind", "type", count, Type, MAXBUF);
-               Config->ConfValue("bind", "ssl", count, Desc, MAXBUF);
+               case AF_INET:
+                       return ntohs(in4.sin_port);
 
-               if (strncmp(Addr, "::ffff:", 7) == 0)
-                       this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+               case AF_INET6:
+                       return ntohs(in6.sin6_port);
 
-               if ((!*Type) || (!strcmp(Type,"clients")))
-               {
-                       irc::portparser portrange(configToken, false);
-                       int portno = -1;
-                       while (0 != (portno = portrange.GetToken()))
-                       {
-                               if (*Addr == '*')
-                                       *Addr = 0;
-
-                               bool skip = false;
-                               for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
-                               {
-                                       if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
-                                       {
-                                               skip = true;
-                                               /* XXX: Here, erase from our copy of the list */
-                                               for (std::vector<std::pair<std::string, int> >::iterator k = old_ports.begin(); k != old_ports.end(); ++k)
-                                               {
-                                                       if ((k->first == Addr) && (k->second == portno))
-                                                       {
-                                                               old_ports.erase(k);
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                               }
-                               if (!skip)
-                               {
-                                       ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
-                                       if (ll->GetFd() > -1)
-                                       {
-                                               bound++;
-                                               ll->SetDescription(*Desc ? Desc : "plaintext");
-                                               ports.push_back(ll);
-                                       }
-                                       else
-                                       {
-                                               failed_ports.push_back(std::make_pair((*Addr ? Addr : "*") + std::string(":") + ConvToStr(portno), strerror(errno)));
-                                       }
-                               }
-                       }
-               }
+               case AF_UNIX:
+                       return 0;
        }
 
-       /* XXX: Here, anything left in our copy list, close as removed */
-       if (!started_with_nothing)
+       // If we have reached this point then we have encountered a bug.
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::port(): socket type %d is unknown!", family());
+       return 0;
+}
+
+std::string irc::sockets::sockaddrs::addr() const
+{
+       switch (family())
        {
-               for (size_t k = 0; k < old_ports.size(); ++k)
-               {
-                       for (std::vector<ListenSocketBase *>::iterator n = ports.begin(); n != ports.end(); ++n)
-                       {
-                               if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
-                               {
-                                       this->Logs->Log("SOCKET",DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
-                                       delete *n;
-                                       ports.erase(n);
-                                       break;
-                               }
-                       }
-               }
+               case AF_INET:
+                       char ip4addr[INET_ADDRSTRLEN];
+                       if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, ip4addr, sizeof(ip4addr)))
+                               return "0.0.0.0";
+                       return ip4addr;
+
+               case AF_INET6:
+                       char ip6addr[INET6_ADDRSTRLEN];
+                       if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ip6addr, sizeof(ip6addr)))
+                               return "0:0:0:0:0:0:0:0";
+                       return ip6addr;
+
+               case AF_UNIX:
+                       return un.sun_path;
        }
 
-       return bound;
+       // If we have reached this point then we have encountered a bug.
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::addr(): socket type %d is unknown!", family());
+       return "<unknown>";
 }
 
-bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
+std::string irc::sockets::sockaddrs::str() const
 {
-       memset(sa, 0, sizeof(*sa));
-       if (!addr || !*addr)
+       switch (family())
        {
-#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
-               return true;
+               case AF_INET:
+                       char ip4addr[INET_ADDRSTRLEN];
+                       if (!inet_ntop(AF_INET, (void*)&in4.sin_addr, ip4addr, sizeof(ip4addr)))
+                               strcpy(ip4addr, "0.0.0.0");
+                       return InspIRCd::Format("%s:%u", ip4addr, ntohs(in4.sin_port));
+
+               case AF_INET6:
+                       char ip6addr[INET6_ADDRSTRLEN];
+                       if (!inet_ntop(AF_INET6, (void*)&in6.sin6_addr, ip6addr, sizeof(ip6addr)))
+                               strcpy(ip6addr, "0:0:0:0:0:0:0:0");
+                       return InspIRCd::Format("[%s]:%u", ip6addr, ntohs(in6.sin6_port));
+
+               case AF_UNIX:
+                       return un.sun_path;
        }
-       else if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0)
+
+       // If we have reached this point then we have encountered a bug.
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::str(): socket type %d is unknown!", family());
+       return "<unknown>";
+}
+
+socklen_t irc::sockets::sockaddrs::sa_size() const
+{
+       switch (family())
        {
-               sa->in4.sin_family = AF_INET;
-               sa->in4.sin_port = htons(port);
-               return true;
+               case AF_INET:
+                       return sizeof(in4);
+
+               case AF_INET6:
+                       return sizeof(in6);
+
+               case AF_UNIX:
+                       return sizeof(un);
        }
-       else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0)
+
+       // If we have reached this point then we have encountered a bug.
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::sa_size(): socket type %d is unknown!", family());
+       return 0;
+}
+
+bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) const
+{
+       if (family() != other.family())
+               return false;
+
+       switch (family())
        {
-               sa->in6.sin6_family = AF_INET6;
-               sa->in6.sin6_port = htons(port);
-               return true;
+               case AF_INET:
+                       return (in4.sin_port == other.in4.sin_port) && (in4.sin_addr.s_addr == other.in4.sin_addr.s_addr);
+
+               case AF_INET6:
+                       return (in6.sin6_port == other.in6.sin6_port) && !memcmp(in6.sin6_addr.s6_addr, other.in6.sin6_addr.s6_addr, 16);
+
+               case AF_UNIX:
+                       return !strcmp(un.sun_path, other.un.sun_path);
        }
-       return false;
+
+       // If we have reached this point then we have encountered a bug.
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::sockaddrs::operator==(): socket type %d is unknown!", family());
+       return !memcmp(this, &other, sizeof(*this));
 }
 
-bool irc::sockets::satoap(const irc::sockets::sockaddrs* sa, std::string& addr, int &port) {
-       char addrv[INET6_ADDRSTRLEN+1];
-       if (sa->sa.sa_family == AF_INET)
+static void sa2cidr(irc::sockets::cidr_mask& cidr, const irc::sockets::sockaddrs& sa, unsigned char range)
+{
+       const unsigned char* base;
+       unsigned char target_byte;
+
+       memset(cidr.bits, 0, sizeof(cidr.bits));
+
+       cidr.type = sa.family();
+       switch (cidr.type)
        {
-               if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv)))
-                       return false;
-               addr = addrv;
-               port = ntohs(sa->in4.sin_port);
-               return true;
+               case AF_UNIX:
+                       // XXX: UNIX sockets don't support CIDR. This fix is non-ideal but I can't
+                       // really think of another way to handle it.
+                       cidr.length = 0;
+                       return;
+
+               case AF_INET:
+                       cidr.length = range > 32 ? 32 : range;
+                       target_byte = sizeof(sa.in4.sin_addr);
+                       base = (unsigned char*)&sa.in4.sin_addr;
+                       break;
+
+               case AF_INET6:
+                       cidr.length = range > 128 ? 128 : range;
+                       target_byte = sizeof(sa.in6.sin6_addr);
+                       base = (unsigned char*)&sa.in6.sin6_addr;
+                       break;
+
+               default:
+                       // If we have reached this point then we have encountered a bug.
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: sa2cidr(): socket type %d is unknown!", cidr.type);
+                       cidr.length = 0;
+                       return;
        }
-       else if (sa->sa.sa_family == AF_INET6)
+
+       unsigned int border = cidr.length / 8;
+       unsigned int bitmask = (0xFF00 >> (range & 7)) & 0xFF;
+       for(unsigned int i=0; i < target_byte; i++)
        {
-               if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv)))
-                       return false;
-               addr = addrv;
-               port = ntohs(sa->in6.sin6_port);
-               return true;
+               if (i < border)
+                       cidr.bits[i] = base[i];
+               else if (i == border)
+                       cidr.bits[i] = base[i] & bitmask;
+               else
+                       return;
        }
-       return false;
 }
 
-static const char all_zero[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0 };
+irc::sockets::cidr_mask::cidr_mask(const irc::sockets::sockaddrs& sa, unsigned char range)
+{
+       sa2cidr(*this, sa, range);
+}
+
+irc::sockets::cidr_mask::cidr_mask(const std::string& mask)
+{
+       std::string::size_type bits_chars = mask.rfind('/');
+       irc::sockets::sockaddrs sa;
 
-std::string irc::sockets::satouser(const irc::sockets::sockaddrs* sa) {
-       char buffer[MAXBUF];
-       if (sa->sa.sa_family == AF_INET)
+       if (bits_chars == std::string::npos)
        {
-               if (sa->in4.sin_addr.s_addr == 0)
-               {
-                       sprintf(buffer, "*:%u", ntohs(sa->in4.sin_port));
-               }
-               else
-               {
-                       const uint8_t* bits = reinterpret_cast<const uint8_t*>(&sa->in4.sin_addr);
-                       sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(sa->in4.sin_port));
-               }
+               irc::sockets::aptosa(mask, 0, sa);
+               sa2cidr(*this, sa, 128);
        }
-       else if (sa->sa.sa_family == AF_INET6)
+       else
        {
-               if (!memcmp(all_zero, &sa->in6.sin6_addr, 16))
-               {
-                       sprintf(buffer, "*:%u", ntohs(sa->in6.sin6_port));
-               }
-               else
-               {
-                       buffer[0] = '[';
-                       if (!inet_ntop(AF_INET6, &sa->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(sa->in6.sin6_port));
-               }
+               unsigned char range = ConvToNum<unsigned char>(mask.substr(bits_chars + 1));
+               irc::sockets::aptosa(mask.substr(0, bits_chars), 0, sa);
+               sa2cidr(*this, sa, range);
        }
-       else
-               return "<unknown>";
-       return std::string(buffer);
 }
 
-int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
+std::string irc::sockets::cidr_mask::str() const
 {
-       if (sa.sa.sa_family == AF_INET)
-               return sizeof(sa.in4);
-       if (sa.sa.sa_family == AF_INET6)
-               return sizeof(sa.in6);
-       return 0;
+       irc::sockets::sockaddrs sa;
+       sa.sa.sa_family = type;
+
+       unsigned char* base;
+       size_t len;
+       switch (type)
+       {
+               case AF_INET:
+                       base = (unsigned char*)&sa.in4.sin_addr;
+                       len = 4;
+                       break;
+
+               case AF_INET6:
+                       base = (unsigned char*)&sa.in6.sin6_addr;
+                       len = 16;
+                       break;
+
+               case AF_UNIX:
+                       return sa.un.sun_path;
+
+               default:
+                       // If we have reached this point then we have encountered a bug.
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "BUG: irc::sockets::cidr_mask::str(): socket type %d is unknown!", type);
+                       return "<unknown>";
+       }
+
+       memcpy(base, bits, len);
+       return sa.addr() + "/" + ConvToStr((int)length);
+}
+
+bool irc::sockets::cidr_mask::operator==(const cidr_mask& other) const
+{
+       return type == other.type && length == other.length &&
+               0 == memcmp(bits, other.bits, 16);
+}
+
+bool irc::sockets::cidr_mask::operator<(const cidr_mask& other) const
+{
+       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
+{
+       if (addr.family() != type)
+               return false;
+       irc::sockets::cidr_mask tmp(addr, length);
+       return tmp == *this;
 }