Close connections when an I/O hook is configured but not loaded.

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

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index 5fd7e6235888f2ef91b9e38627a6b782e1d0c021..339045a8c301c5ca75196cb06c90b4d4eb027278 100644 (file)
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -21,7 +21,6 @@
  */
 
 
-#include "exitcodes.h"
 #include "inspircd.h"
 
 #include <sys/poll.h>
@@ -36,21 +35,12 @@ namespace
        std::vector<struct pollfd> events(16);
        /** This vector maps fds to an index in the events array.
         */
-       std::vector<int> fd_mappings(16);
+       std::vector<int> fd_mappings(16, -1);
 }
 
 void SocketEngine::Init()
 {
-       struct rlimit limits;
-       if (!getrlimit(RLIMIT_NOFILE, &limits))
-       {
-               MAX_DESCRIPTORS = limits.rlim_cur;
-       }
-       else
-       {
-               // MAX_DESCRIPTORS is mainly used for display purposes, it's not a problem that getrlimit() failed
-               MAX_DESCRIPTORS = -1;
-       }
+       LookupMaxFds();
 }
 
 void SocketEngine::Deinit()
@@ -168,7 +158,7 @@ int SocketEngine::DispatchEvents()
        int processed = 0;
        ServerInstance->UpdateTime();
 
-       for (int index = 0; index < CurrentSetSize && processed < i; index++)
+       for (size_t index = 0; index < CurrentSetSize && processed < i; index++)
        {
                struct pollfd& pfd = events[index];
 
@@ -217,7 +207,7 @@ int SocketEngine::DispatchEvents()
 
                        // The vector could've been resized, reference can be invalid by now; don't use it
                        events[index].events = mask_to_poll(mask);
-                       eh->eh->OnEventHandlerWrite();
+                       eh->OnEventHandlerWrite();
                }
        }