Some AddMode fixes

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 1cf5bd8c1569f8ecf31cf365e662168557532724..ec5362f8cfbd126778dae547bc630ec8cb518f3f 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -49,10 +49,7 @@ bool EPollEngine::AddFd(EventHandler* eh)
                return false;
 
        if (ref[fd])
-       {
-               ServerInstance->Log(DEBUG,"Ref occupied!");
                return false;
-       }
 
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
@@ -89,9 +86,6 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return false;
 
-       ref[fd] = NULL;
-       CurrentSetSize--;
-
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
        eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
@@ -99,7 +93,13 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
 
        if (i < 0 && !force)
+       {
+               ServerInstance->Log(DEBUG,"Cant remove socket: %s", strerror(errno));
                return false;
+       }
+
+       ref[fd] = NULL;
+       CurrentSetSize--;
 
        ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
        return true;