Move typedef ClassVector to ServerConfig::ClassVector

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

diff --git a/src/socket.cpp b/src/socket.cpp
index 4ebed1ccd7117684f61c747729c790ae6899d2a7..89c9969ffcbd0f7b657a3409ca7b37822bb098a7 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -22,8 +22,7 @@
 
 
 #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.
@@ -46,7 +45,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
        else if (!irc::sockets::aptosa(addr, port, servaddr))
                return false;
 
-       ret = SE->Bind(sockfd, servaddr);
+       ret = SocketEngine::Bind(sockfd, servaddr);
 
        if (ret < 0)
        {
@@ -56,7 +55,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
        {
                if (dolisten)
                {
-                       if (SE->Listen(sockfd, Config->MaxConn) == -1)
+                       if (SocketEngine::Listen(sockfd, Config->MaxConn) == -1)
                        {
                                this->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR in listen(): %s",strerror(errno));
                                return false;
@@ -64,7 +63,7 @@ bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
                        else
                        {
                                this->Logs->Log("SOCKET", LOG_DEBUG, "New socket binding for %d with listen: %s:%d", sockfd, addr, port);
-                               SE->NonBlocking(sockfd);
+                               SocketEngine::NonBlocking(sockfd);
                                return true;
                        }
                }
@@ -106,6 +105,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 +218,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)
@@ -367,4 +366,3 @@ bool irc::sockets::cidr_mask::match(const irc::sockets::sockaddrs& addr) const
        irc::sockets::cidr_mask tmp(addr, length);
        return tmp == *this;
 }
-