]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/socket.cpp
Add SerializeFormat for easier metadata formatting
[user/henk/code/inspircd.git] / src / socket.cpp
index 2aa2c73b0b1259053ac4c57b6479b355f81f262d..ccae48a6d7cc654e2f7db2f063e5191f4dbd3595 100644 (file)
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDsocket */
+/* $Core */
 
 #include "inspircd.h"
 #include "socket.h"
 #include "socketengine.h"
-#include "wildcard.h"
+using irc::sockets::sockaddrs;
 
-using namespace irc::sockets;
-
-/* Used when comparing CIDR masks for the modulus bits left over.
- * A lot of ircd's seem to do this:
- * ((-1) << (8 - (mask % 8)))
- * But imho, it sucks in comparison to a nice neat lookup table.
- */
-const unsigned char inverted_bits[8] = {       0x00, /* 00000000 - 0 bits - never actually used */
-                               0x80, /* 10000000 - 1 bits */
-                               0xC0, /* 11000000 - 2 bits */
-                               0xE0, /* 11100000 - 3 bits */
-                               0xF0, /* 11110000 - 4 bits */
-                               0xF8, /* 11111000 - 5 bits */
-                               0xFC, /* 11111100 - 6 bits */
-                               0xFE  /* 11111110 - 7 bits */
-};
-
-
-ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerInstance(Instance), desc("plaintext"), bind_addr(addr), bind_port(port)
-{
-       this->SetFd(OpenTCPSocket(addr));
-       if (this->GetFd() > -1)
-       {
-               if (!Instance->BindSocket(this->fd,port,addr))
-                       this->fd = -1;
-#ifdef IPV6
-               if ((!*addr) || (strchr(addr,':')))
-                       this->family = AF_INET6;
-               else
-#endif
-               this->family = AF_INET;
-               Instance->SE->AddFd(this);
-       }
-}
-
-ListenSocket::~ListenSocket()
-{
-       if (this->GetFd() > -1)
-       {
-               ServerInstance->SE->DelFd(this);
-               ServerInstance->Log(DEBUG,"Shut down listener on fd %d", this->fd);
-               if (ServerInstance->SE->Shutdown(this, 2) || ServerInstance->SE->Close(this))
-                       ServerInstance->Log(DEBUG,"Failed to cancel listener: %s", strerror(errno));
-               this->fd = -1;
-       }
-}
-
-void ListenSocket::HandleEvent(EventType, int)
-{
-       sockaddr* sock_us = new sockaddr[2];    // our port number
-       sockaddr* client = new sockaddr[2];
-       socklen_t uslen, length;                // length of our port number
-       int incomingSockfd, in_port;
-
-#ifdef IPV6
-       if (this->family == AF_INET6)
-       {
-               uslen = sizeof(sockaddr_in6);
-               length = sizeof(sockaddr_in6);
-       }
-       else
-#endif
-       {
-               uslen = sizeof(sockaddr_in);
-               length = sizeof(sockaddr_in);
-       }
-
-       incomingSockfd = ServerInstance->SE->Accept(this, (sockaddr*)client, &length);
-
-       if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
-       {
-               char buf[MAXBUF];
-#ifdef IPV6
-               if (this->family == AF_INET6)
-               {
-                       inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
-                       in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
-               }
-               else
-#endif
-               {
-                       inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
-                       in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
-               }
-
-               ServerInstance->SE->NonBlocking(incomingSockfd);
-
-               if (ServerInstance->Config->GetIOHook(in_port))
-               {
-                       try
-                       {
-                               ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port);
-                       }
-                       catch (CoreException& modexcept)
-                       {
-                               ServerInstance->Log(DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                       }
-               }
-               ServerInstance->stats->statsAccept++;
-               User::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
-       }
-       else
-       {
-               ServerInstance->SE->Shutdown(incomingSockfd, 2);
-               ServerInstance->SE->Close(incomingSockfd);
-               ServerInstance->stats->statsRefused++;
-       }
-       delete[] client;
-       delete[] sock_us;
-}
-
-/* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
-bool irc::sockets::MatchCIDRBits(unsigned char* address, unsigned char* mask, unsigned int mask_bits)
-{
-       unsigned int divisor = mask_bits / 8; /* Number of whole bytes in the mask */
-       unsigned int modulus = mask_bits % 8; /* Remaining bits in the mask after whole bytes are dealt with */
-
-       /* First (this is faster) compare the odd bits with logic ops */
-       if (modulus)
-               if ((address[divisor] & inverted_bits[modulus]) != (mask[divisor] & inverted_bits[modulus]))
-                       /* If they dont match, return false */
-                       return false;
-
-       /* Secondly (this is slower) compare the whole bytes */
-       if (memcmp(address, mask, divisor))
-               return false;
-
-       /* The address matches the mask, to mask_bits bits of mask */
-       return true;
-}
-
-/* Match CIDR, but dont attempt to match() against leading *!*@ sections */
-bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask)
-{
-       return MatchCIDR(address, cidr_mask, false);
-}
-
-/* Match CIDR strings, e.g. 127.0.0.1 to 127.0.0.0/8 or 3ffe:1:5:6::8 to 3ffe:1::0/32
- * If you have a lot of hosts to match, youre probably better off building your mask once
- * and then using the lower level MatchCIDRBits directly.
- *
- * This will also attempt to match any leading usernames or nicknames on the mask, using
- * match(), when match_with_username is true.
+/** 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 irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool match_with_username)
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
-       unsigned char addr_raw[16];
-       unsigned char mask_raw[16];
-       unsigned int bits = 0;
-       char* mask = NULL;
+       sockaddrs servaddr;
+       int ret;
 
-       /* The caller is trying to match ident@<mask>/bits.
-        * Chop off the ident@ portion, use match() on it
-        * seperately.
-        */
-       if (match_with_username)
-       {
-               /* Duplicate the strings, and try to find the position
-                * of the @ symbol in each */
-               char* address_dupe = strdup(address);
-               char* cidr_dupe = strdup(cidr_mask);
-       
-               /* Use strchr not strrchr, because its going to be nearer to the left */
-               char* username_mask_pos = strrchr(cidr_dupe, '@');
-               char* username_addr_pos = strrchr(address_dupe, '@');
-
-               /* Both strings have an @ symbol in them */
-               if (username_mask_pos && username_addr_pos)
-               {
-                       /* Zero out the location of the @ symbol */
-                       *username_mask_pos = *username_addr_pos = 0;
-
-                       /* Try and match() the strings before the @
-                        * symbols, and recursively call MatchCIDR without
-                        * username matching enabled to match the host part.
-                        */
-                       bool result = (match(address_dupe, cidr_dupe) && MatchCIDR(username_addr_pos + 1, username_mask_pos + 1, false));
+       if (*addr == '*' || *addr == '\0')
+               addr = NULL;
 
-                       /* Free the stuff we created */
-                       free(address_dupe);
-                       free(cidr_dupe);
-
-                       /* Return a result */
-                       return result;
-               }
-               else
-               {
-                       /* One or both didnt have an @ in,
-                        * just match as CIDR
-                        */
-                       free(address_dupe);
-                       free(cidr_dupe);
-                       mask = strdup(cidr_mask);
-               }
-       }
-       else
+       if (port == -1 && !addr)
        {
-               /* Make a copy of the cidr mask string,
-                * we're going to change it
+               /* Port -1: Means UDP IPV4 port binding - Special case
+                * used by DNS engine.
                 */
-               mask = strdup(cidr_mask);
-       }
-
-       in_addr  address_in4;
-       in_addr  mask_in4;
-
-
-       /* Use strrchr for this, its nearer to the right */
-       char* bits_chars = strrchr(mask,'/');
-
-       if (bits_chars)
-       {
-               bits = atoi(bits_chars + 1);
-               *bits_chars = 0;
+               memset(&servaddr, 0, sizeof(servaddr));
+               servaddr.in4.sin_family = AF_INET;
        }
-       else
-       {
-               /* No 'number of bits' field! */
-               free(mask);
+       else if (!irc::sockets::aptosa(addr, port, &servaddr))
                return false;
-       }
 
-#ifdef SUPPORT_IP6LINKS
-       in6_addr address_in6;
-       in6_addr mask_in6;
-
-       if (inet_pton(AF_INET6, address, &address_in6) > 0)
-       {
-               if (inet_pton(AF_INET6, mask, &mask_in6) > 0)
-               {
-                       memcpy(&addr_raw, &address_in6.s6_addr, 16);
-                       memcpy(&mask_raw, &mask_in6.s6_addr, 16);
-
-                       if (bits > 128)
-                               bits = 128;
-               }
-               else
-               {
-                       /* The address was valid ipv6, but the mask
-                        * that goes with it wasnt.
-                        */
-                       free(mask);
-                       return false;
-               }
-       }
-       else
-#endif
-       if (inet_pton(AF_INET, address, &address_in4) > 0)
-       {
-               if (inet_pton(AF_INET, mask, &mask_in4) > 0)
-               {
-                       memcpy(&addr_raw, &address_in4.s_addr, 4);
-                       memcpy(&mask_raw, &mask_in4.s_addr, 4);
-
-                       if (bits > 32)
-                               bits = 32;
-               }
-               else
-               {
-                       /* The address was valid ipv4,
-                        * but the mask that went with it wasnt.
-                        */
-                       free(mask);
-                       return false;
-               }
-       }
-       else
-       {
-               /* The address was neither ipv4 or ipv6 */
-               free(mask);
-               return false;
-       }
-
-       /* Low-level-match the bits in the raw data */
-       free(mask);
-       return MatchCIDRBits(addr_raw, mask_raw, bits);
-}
-
-/** 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, char* addr, bool dolisten)
-{
-       /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
-       sockaddr* server = new sockaddr[2];
-       memset(server,0,sizeof(sockaddr)*2);
-
-       int ret, size;
-
-       if (*addr == '*')
-               *addr = 0;
-
-#ifdef IPV6
-       if (*addr)
-       {
-               /* There is an address here. Is it ipv6? */
-               if (strchr(addr,':'))
-               {
-                       /* Yes it is */
-                       in6_addr addy;
-                       if (inet_pton(AF_INET6, addr, &addy) < 1)
-                       {
-                               delete[] server;
-                               return false;
-                       }
-
-                       ((sockaddr_in6*)server)->sin6_family = AF_INET6;
-                       memcpy(&(((sockaddr_in6*)server)->sin6_addr), &addy, sizeof(in6_addr));
-                       ((sockaddr_in6*)server)->sin6_port = htons(port);
-                       size = sizeof(sockaddr_in6);
-               }
-               else
-               {
-                       /* No, its not */
-                       in_addr addy;
-                       if (inet_pton(AF_INET, addr, &addy) < 1)
-                       {
-                               delete[] server;
-                               return false;
-                       }
-
-                       ((sockaddr_in*)server)->sin_family = AF_INET;
-                       ((sockaddr_in*)server)->sin_addr = addy;
-                       ((sockaddr_in*)server)->sin_port = htons(port);
-                       size = sizeof(sockaddr_in);
-               }
-       }
-       else
-       {
-               if (port == -1)
-               {
-                       /* Port -1: Means UDP IPV4 port binding - Special case
-                        * used by DNS engine.
-                        */
-                       ((sockaddr_in*)server)->sin_family = AF_INET;
-                       ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
-                       ((sockaddr_in*)server)->sin_port = 0;
-                       size = sizeof(sockaddr_in);
-               }
-               else
-               {
-                       /* Theres no address here, default to ipv6 bind to all */
-                       ((sockaddr_in6*)server)->sin6_family = AF_INET6;
-                       memset(&(((sockaddr_in6*)server)->sin6_addr), 0, sizeof(in6_addr));
-                       ((sockaddr_in6*)server)->sin6_port = htons(port);
-                       size = sizeof(sockaddr_in6);
-               }
-       }
-#else
-       /* If we aren't built with ipv6, the choice becomes simple */
-       ((sockaddr_in*)server)->sin_family = AF_INET;
-       if (*addr)
-       {
-               /* There is an address here. */
-               in_addr addy;
-               if (inet_pton(AF_INET, addr, &addy) < 1)
-               {
-                       delete[] server;
-                       return false;
-               }
-               ((sockaddr_in*)server)->sin_addr = addy;
-       }
-       else
-       {
-               /* Bind ipv4 to all */
-               ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
-       }
-       /* Bind ipv4 port number */
-       ((sockaddr_in*)server)->sin_port = htons(port);
-       size = sizeof(sockaddr_in);
-#endif
-       ret = SE->Bind(sockfd, server, size);
-       delete[] server;
+       ret = SE->Bind(sockfd, &servaddr.sa, sa_size(servaddr));
 
        if (ret < 0)
        {
@@ -403,148 +53,231 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                {
                        if (SE->Listen(sockfd, Config->MaxConn) == -1)
                        {
-                               this->Log(DEFAULT,"ERROR in listen(): %s",strerror(errno));
+                               this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
                                return false;
                        }
                        else
                        {
-                               this->Log(DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+                               this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
                                SE->NonBlocking(sockfd);
                                return true;
                        }
                }
                else
                {
-                       this->Log(DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+                       this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
                        return true;
                }
        }
 }
 
 // Open a TCP Socket
-int irc::sockets::OpenTCPSocket(char* addr, int socktype)
+int irc::sockets::OpenTCPSocket(const char* addr, int socktype)
 {
        int sockfd;
        int on = 1;
        addr = addr;
        struct linger linger = { 0, 0 };
+       if (!*addr)
+       {
 #ifdef IPV6
-       if (strchr(addr,':') || (!*addr))
+               sockfd = socket (PF_INET6, socktype, 0);
+               if (sockfd < 0)
+#endif
+                       sockfd = socket (PF_INET, socktype, 0);
+       }
+       else if (strchr(addr,':'))
                sockfd = socket (PF_INET6, socktype, 0);
        else
                sockfd = socket (PF_INET, socktype, 0);
+
        if (sockfd < 0)
-#else
-       if ((sockfd = socket (PF_INET, socktype, 0)) < 0)
-#endif
        {
                return ERROR;
        }
        else
        {
-               setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof(on));
+               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, (char*)&linger,sizeof(linger));
+               setsockopt(sockfd, SOL_SOCKET, SO_LINGER, &linger, sizeof(linger));
                return (sockfd);
        }
 }
 
-int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports)
+// 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)
 {
-       char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF];
+       char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF], Desc[MAXBUF];
        int bound = 0;
-       bool started_with_nothing = (Config->ports.size() == 0);
-       std::vector<std::pair<std::string, int> > old_ports;
-
-       /* XXX: Make a copy of the old ip/port pairs here */
-       for (std::vector<ListenSocket*>::iterator o = Config->ports.begin(); o != Config->ports.end(); ++o)
-               old_ports.push_back(make_pair((*o)->GetIP(), (*o)->GetPort()));
+       std::vector<ListenSocketBase*> old_ports(ports.begin(), ports.end());
 
-       for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "bind"); count++)
+       for (int count = 0; count < Config->ConfValueEnum("bind"); count++)
        {
-               Config->ConfValue(Config->config_data, "bind", "port", count, configToken, MAXBUF);
-               Config->ConfValue(Config->config_data, "bind", "address", count, Addr, MAXBUF);
-               Config->ConfValue(Config->config_data, "bind", "type", count, Type, MAXBUF);
-               
+               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);
+
                if (strncmp(Addr, "::ffff:", 7) == 0)
-                       this->Log(DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
-               
+                       this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+
                if ((!*Type) || (!strcmp(Type,"clients")))
                {
                        irc::portparser portrange(configToken, false);
                        int portno = -1;
-                       while ((portno = portrange.GetToken()))
+                       while (0 != (portno = portrange.GetToken()))
                        {
                                if (*Addr == '*')
                                        *Addr = 0;
 
+                               irc::sockets::sockaddrs bindspec;
+                               irc::sockets::aptosa(Addr, portno, &bindspec);
+                               std::string bind_readable = irc::sockets::satouser(&bindspec);
+
                                bool skip = false;
-                               for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
+                               for (std::vector<ListenSocketBase *>::iterator n = old_ports.begin(); n != old_ports.end(); ++n)
                                {
-                                       if (((*n)->GetIP() == Addr) && ((*n)->GetPort() == portno))
+                                       if ((*n)->GetBindDesc() == bind_readable)
                                        {
                                                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;
-                                                       }
-                                               }
+                                               old_ports.erase(n);
+                                               break;
                                        }
                                }
                                if (!skip)
                                {
-                                       ListenSocket* ll = new ListenSocket(this, portno, Addr);
+                                       ClientListenSocket *ll = new ClientListenSocket(this, portno, Addr);
                                        if (ll->GetFd() > -1)
                                        {
                                                bound++;
-                                               Config->ports.push_back(ll);
+                                               ll->SetDescription(*Desc ? Desc : "plaintext");
+                                               ports.push_back(ll);
                                        }
                                        else
                                        {
-                                               failed_ports.push_back(std::make_pair(Addr, portno));
+                                               failed_ports.push_back(std::make_pair(bind_readable, strerror(errno)));
                                        }
-                                       ports_found++;
                                }
                        }
                }
        }
 
-       /* XXX: Here, anything left in our copy list, close as removed */
-       if (!started_with_nothing)
+       std::vector<ListenSocketBase *>::iterator n = ports.begin();
+       for (std::vector<ListenSocketBase *>::iterator o = old_ports.begin(); o != old_ports.end(); ++o)
        {
-               for (size_t k = 0; k < old_ports.size(); ++k)
+               while (n != ports.end() && *n != *o)
+                       n++;
+               if (n == ports.end())
                {
-                       for (std::vector<ListenSocket*>::iterator n = Config->ports.begin(); n != Config->ports.end(); ++n)
-                       {
-                               if (((*n)->GetIP() == old_ports[k].first) && ((*n)->GetPort() == old_ports[k].second))
-                               {
-                                       this->Log(DEFAULT,"Port binding %s:%d was removed from the config file, closing.", old_ports[k].first.c_str(), old_ports[k].second);
-                                       delete *n;
-                                       Config->ports.erase(n);
-                                       break;
-                               }
-                       }
+                       this->Logs->Log("SOCKET",ERROR,"Port bindings slipped out of vector, aborting close!");
+                       break;
                }
+
+               this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.",
+                       (*n)->GetBindDesc().c_str());
+               delete *n;
+
+               // this keeps the iterator valid, pointing to the next element
+               n = ports.erase(n);
        }
 
        return bound;
 }
 
-const char* irc::sockets::insp_ntoa(insp_inaddr n)
+bool irc::sockets::aptosa(const char* addr, int port, irc::sockets::sockaddrs* sa)
 {
-       static char buf[1024];
-       inet_ntop(AF_FAMILY, &n, buf, sizeof(buf));
-       return buf;
+       memset(sa, 0, sizeof(*sa));
+       if (!addr || !*addr)
+       {
+#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;
+       }
+       else if (inet_pton(AF_INET, addr, &sa->in4.sin_addr) > 0)
+       {
+               sa->in4.sin_family = AF_INET;
+               sa->in4.sin_port = htons(port);
+               return true;
+       }
+       else if (inet_pton(AF_INET6, addr, &sa->in6.sin6_addr) > 0)
+       {
+               sa->in6.sin6_family = AF_INET6;
+               sa->in6.sin6_port = htons(port);
+               return true;
+       }
+       return false;
 }
 
-int irc::sockets::insp_aton(const char* a, insp_inaddr* n)
-{
-       return inet_pton(AF_FAMILY, a, n);
+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)
+       {
+               if (!inet_ntop(AF_INET, &sa->in4.sin_addr, addrv, sizeof(addrv)))
+                       return false;
+               addr = addrv;
+               port = ntohs(sa->in4.sin_port);
+               return true;
+       }
+       else if (sa->sa.sa_family == AF_INET6)
+       {
+               if (!inet_ntop(AF_INET6, &sa->in6.sin6_addr, addrv, sizeof(addrv)))
+                       return false;
+               addr = addrv;
+               port = ntohs(sa->in6.sin6_port);
+               return true;
+       }
+       return false;
 }
 
+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::satouser(const irc::sockets::sockaddrs* sa) {
+       char buffer[MAXBUF];
+       if (sa->sa.sa_family == AF_INET)
+       {
+               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));
+               }
+       }
+       else if (sa->sa.sa_family == AF_INET6)
+       {
+               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));
+               }
+       }
+       else
+               return "<unknown>";
+       return std::string(buffer);
+}
+
+int irc::sockets::sa_size(irc::sockets::sockaddrs& sa)
+{
+       if (sa.sa.sa_family == AF_INET)
+               return sizeof(sa.in4);
+       if (sa.sa.sa_family == AF_INET6)
+               return sizeof(sa.in6);
+       return 0;
+}