Split IOHook into IOHook and IOHookProvider

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 98ff3e00cccf80146eec50d8e3f39336f0978bf2..c65cd5b27faa870523897695f9b026e685c6f888 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -58,19 +58,19 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
                {
                        if (SE->Listen(sockfd, Config->MaxConn) == -1)
                        {
-                               this->Logs->Log("SOCKET",DEFAULT,"ERROR in listen(): %s",strerror(errno));
+                               this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
                                return false;
                        }
                        else
                        {
-                               this->Logs->Log("SOCKET",DEBUG,"New socket binding for %d with listen: %s:%d", sockfd, addr, port);
+                               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",DEBUG,"New socket binding for %d without listen: %s:%d", sockfd, addr, port);
+                       this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d without listen: %s:%d", sockfd, addr, port);
                        return true;
                }
        }
@@ -89,7 +89,7 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
                std::string Addr = tag->getString("address");
 
                if (strncasecmp(Addr.c_str(), "::ffff:", 7) == 0)
-                       this->Logs->Log("SOCKET",DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
+                       this->Logs->Log("SOCKET", LOG_DEFAULT, "Using 4in6 (::ffff:) isn't recommended. You should bind IPv4 addresses directly instead.");
 
                irc::portparser portrange(porttag, false);
                int portno = -1;
@@ -105,6 +105,9 @@ 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;
@@ -135,11 +138,11 @@ int InspIRCd::BindPorts(FailedPortList &failed_ports)
                        n++;
                if (n == ports.end())
                {
-                       this->Logs->Log("SOCKET",DEFAULT,"Port bindings slipped out of vector, aborting close!");
+                       this->Logs->Log("SOCKET", LOG_DEFAULT, "Port bindings slipped out of vector, aborting close!");
                        break;
                }
 
-               this->Logs->Log("SOCKET",DEFAULT, "Port binding %s was removed from the config file, closing.",
+               this->Logs->Log("SOCKET", LOG_DEFAULT, "Port binding %s was removed from the config file, closing.",
                        (**n).bind_desc.c_str());
                delete *n;
 
@@ -220,24 +223,22 @@ 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];
        if (sa.sa_family == AF_INET)
        {
-               const uint8_t* bits = reinterpret_cast<const uint8_t*>(&in4.sin_addr);
-               sprintf(buffer, "%d.%d.%d.%d:%u", bits[0], bits[1], bits[2], bits[3], ntohs(in4.sin_port));
+               char ipaddr[INET_ADDRSTRLEN];
+               inet_ntop(AF_INET, &in4.sin_addr, ipaddr, sizeof(ipaddr));
+               return InspIRCd::Format("%s:%u", ipaddr, ntohs(in4.sin_port));
        }
-       else if (sa.sa_family == AF_INET6)
+
+       if (sa.sa_family == AF_INET6)
        {
-               buffer[0] = '[';
-               if (!inet_ntop(AF_INET6, &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(in6.sin6_port));
+               char ipaddr[INET6_ADDRSTRLEN];
+               inet_ntop(AF_INET6, &in6.sin6_addr, ipaddr, sizeof(ipaddr));
+               return InspIRCd::Format("[%s]:%u", ipaddr, ntohs(in6.sin6_port));
        }
-       else
-               return "<unknown>";
-       return std::string(buffer);
+
+       // This should never happen.
+       return "<unknown>";
 }
 
 int irc::sockets::sockaddrs::sa_size() const
@@ -263,35 +264,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;
        }
 }
 
@@ -312,7 +319,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);
        }