Change allocation of InspIRCd::BanCache to be physically part of the object containing it

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 0f926aaf6190faa29ac5bb18290c249eeab2836c..2a74c0b683b1a848c7f4b78cb91668dde699dcc1 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -78,7 +78,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        {
                int errstore = errno;
                SocketEngine::Shutdown(this, 2);
-               SocketEngine::Close(this);
+               SocketEngine::Close(this->GetFd());
                this->fd = -1;
                errno = errstore;
        }
@@ -95,12 +95,10 @@ ListenSocket::~ListenSocket()
 {
        if (this->GetFd() > -1)
        {
-               SocketEngine::DelFd(this);
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
                SocketEngine::Shutdown(this, 2);
                if (SocketEngine::Close(this) != 0)
                        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to cancel listener: %s", strerror(errno));
-               this->fd = -1;
        }
 }
 
@@ -116,7 +114,7 @@ void ListenSocket::AcceptInternal()
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
        if (incomingSockfd < 0)
        {
-               ServerInstance->stats->statsRefused++;
+               ServerInstance->stats.Refused++;
                return;
        }
 
@@ -127,25 +125,6 @@ void ListenSocket::AcceptInternal()
                irc::sockets::aptosa(bind_addr, bind_port, server);
        }
 
-       /*
-        * XXX -
-        * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
-        * its a pretty big but for the moment valid assumption:
-        * file descriptors are handed out starting at 0, and are recycled as theyre freed.
-        * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
-        * irc server at once (or the irc server otherwise initiating this many connections, files etc)
-        * which for the time being is a physical impossibility (even the largest networks dont have more
-        * than about 10,000 users on ONE server!)
-        */
-       if (incomingSockfd >= SocketEngine::GetMaxFds())
-       {
-               ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Server is full");
-               SocketEngine::Shutdown(incomingSockfd, 2);
-               SocketEngine::Close(incomingSockfd);
-               ServerInstance->stats->statsRefused++;
-               return;
-       }
-
        if (client.sa.sa_family == AF_INET6)
        {
                /*
@@ -191,11 +170,11 @@ void ListenSocket::AcceptInternal()
        }
        if (res == MOD_RES_ALLOW)
        {
-               ServerInstance->stats->statsAccept++;
+               ServerInstance->stats.Accept++;
        }
        else
        {
-               ServerInstance->stats->statsRefused++;
+               ServerInstance->stats.Refused++;
                ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Refusing connection on %s - %s",
                        bind_desc.c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found");
                SocketEngine::Close(incomingSockfd);