Merge branch 'master+gnutlsprio'

[user/henk/code/inspircd.git] / src / socketengines / socketengine_ports.cpp

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index deafd8fcbb60b9548fd25c4a715f96af14583944..d94d02664f1b5597d0c2b4b89c9e0f47643054b0 100644 (file)
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -25,11 +25,7 @@
 # error You need Solaris 10 or later to make use of this code.
 #endif
 
-#include <vector>
-#include <string>
-#include <map>
 #include "inspircd.h"
-#include "socketengine.h"
 #include <port.h>
 #include <iostream>
 #include <ulimit.h>
@@ -48,17 +44,9 @@ namespace
  */
 void SocketEngine::Init()
 {
-       int max = ulimit(4, 0);
-       if (max > 0)
-       {
-               MAX_DESCRIPTORS = max;
-       }
-       else
-       {
-               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
-               std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
-               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
-       }
+       // MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number
+       MAX_DESCRIPTORS = ulimit(4, 0);
+
        EngineHandle = port_create();
 
        if (EngineHandle == -1)
@@ -172,14 +160,14 @@ int SocketEngine::DispatchEvents()
                if (portev_events & POLLRDNORM)
                {
                        stats.ReadEvents++;
-                       eh->HandleEvent(EVENT_READ);
+                       eh->OnEventHandlerRead();
                        if (eh != GetRef(fd))
                                continue;
                }
                if (portev_events & POLLWRNORM)
                {
                        stats.WriteEvents++;
-                       eh->HandleEvent(EVENT_WRITE);
+                       eh->OnEventHandlerWrite();
                }
        }