Was checking 'channel', not 'dest'.

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index be46451fabfde3c4a4bb9aa100a23326bf93823e..89be6cc416d06077ec2a318b2a76c62243d0f507 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)
@@ -55,7 +52,10 @@ bool EPollEngine::AddFd(EventHandler* eh)
                return false;
        }
        if (ref[fd])
+       {
+               ServerInstance->Log(DEFAULT,"Slot %d already occupied",fd);
                return false;
+       }
 
        ref[fd] = eh;
 
@@ -87,7 +87,7 @@ bool EPollEngine::DelFd(EventHandler* eh)
 
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
-       ref[fd]->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
+       eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
        if (i < 0)