Only output the 'AES on' message if the socket state isnt I_ERROR when its reached

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 9057c6d658e246cee67c1c196d9b2c3ae5544bf1..2e3f28af658a73bacc8ce170e0201d1169f3f3c4 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -14,11 +14,8 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include <sys/epoll.h>
-#include <vector>
-#include <string>
 #include "socketengine_epoll.h"
 
 EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
@@ -111,15 +108,16 @@ int EPollEngine::GetRemainingFds()
        return MAX_DESCRIPTORS - CurrentSetSize;
 }
 
-int EPollEngine::Wait(EventHandler** fdlist)
+int EPollEngine::DispatchEvents()
 {
-       int result = 0;
-
        int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50);
        for (int j = 0; j < i; j++)
-               fdlist[result++] = ref[events[j].data.fd];
+       {
+               ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ref[events[j].data.fd]->Readable() ? "read" : "write", ref[events[j].data.fd]->GetFd());
+               ref[events[j].data.fd]->HandleEvent(ref[events[j].data.fd]->Readable() ? EVENT_READ : EVENT_WRITE);
+       }
 
-       return result;
+       return i;
 }
 
 std::string EPollEngine::GetName()