Change return type of ListenSocket::ResetIOHookProvider() to void

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index e73a8f4cee9b9fa89df7c2e082c9a5f4182ea253..f560ad277e0e378853571f6f03483e9191c2f7e2 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -19,8 +19,6 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "socketengine.h"
 
 #ifndef _WIN32
 #include <netinet/tcp.h>
@@ -102,8 +100,7 @@ ListenSocket::~ListenSocket()
        }
 }
 
-/* Just seperated into another func for tidiness really.. */
-void ListenSocket::AcceptInternal()
+void ListenSocket::OnEventHandlerRead()
 {
        irc::sockets::sockaddrs client;
        irc::sockets::sockaddrs server;
@@ -111,10 +108,10 @@ void ListenSocket::AcceptInternal()
        socklen_t length = sizeof(client);
        int incomingSockfd = SocketEngine::Accept(this, &client.sa, &length);
 
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Accepting connection on socket %s fd %d", bind_desc.c_str(), incomingSockfd);
        if (incomingSockfd < 0)
        {
-               ServerInstance->stats->statsRefused++;
+               ServerInstance->stats.Refused++;
                return;
        }
 
@@ -125,25 +122,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)
        {
                /*
@@ -189,34 +167,18 @@ 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);
        }
 }
 
-void ListenSocket::HandleEvent(EventType e, int err)
-{
-       switch (e)
-       {
-               case EVENT_ERROR:
-                       ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
-                       break;
-               case EVENT_WRITE:
-                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
-                       break;
-               case EVENT_READ:
-                       this->AcceptInternal();
-                       break;
-       }
-}
-
-bool ListenSocket::ResetIOHookProvider()
+void ListenSocket::ResetIOHookProvider()
 {
        std::string provname = bind_tag->getString("ssl");
        if (!provname.empty())
@@ -224,7 +186,4 @@ bool ListenSocket::ResetIOHookProvider()
 
        // Set the new provider name, dynref handles the rest
        iohookprov.SetProvider(provname);
-
-       // Return true if no provider was set, or one was set and it was also found
-       return (provname.empty() || iohookprov);
 }