Update UserManager documentation and comments

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 9ec7544f24f67ae440c295d72804b0589da12cf0..17f13bb8a22c22a47fc7e752a30b406b39bcce41 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -22,59 +22,6 @@
 
 
 #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)
-{
-       sockaddrs servaddr;
-       int ret;
-
-       if ((*addr == '*' || *addr == '\0') && port == -1)
-       {
-               /* Port -1: Means UDP IPV4 port binding - Special case
-                * used by DNS engine.
-                */
-               memset(&servaddr, 0, sizeof(servaddr));
-               servaddr.in4.sin_family = AF_INET;
-       }
-       else if (!irc::sockets::aptosa(addr, port, servaddr))
-               return false;
-
-       ret = SE->Bind(sockfd, servaddr);
-
-       if (ret < 0)
-       {
-               return false;
-       }
-       else
-       {
-               if (dolisten)
-               {
-                       if (SE->Listen(sockfd, Config->MaxConn) == -1)
-                       {
-                               this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
-                               return false;
-                       }
-                       else
-                       {
-                               this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d with listen: %s:%d", sockfd, addr, port);
-                               SE->NonBlocking(sockfd);
-                               return true;
-                       }
-               }
-               else
-               {
-                       this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d without listen: %s:%d", sockfd, addr, port);
-                       return true;
-               }
-       }
-}
 
 int InspIRCd::BindPorts(FailedPortList &failed_ports)
 {
@@ -106,6 +53,8 @@ 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
+                                       (*n)->ResetIOHookProvider();
+
                                        skip = true;
                                        old_ports.erase(n);
                                        break;
@@ -217,8 +166,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
 {
        if (sa.sa_family == AF_INET)
@@ -262,35 +209,41 @@ bool irc::sockets::sockaddrs::operator==(const irc::sockets::sockaddrs& other) c
 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;
        }
 }
 
@@ -361,4 +314,3 @@ bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const
        irc::sockets::cidr_mask tmp(addr, length);
        return tmp == *this;
 }
-