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 df79aa08320f9085237f76d33f5d28bbb95b0383..ec5362f8cfbd126778dae547bc630ec8cb518f3f 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -49,7 +49,7 @@ bool EPollEngine::AddFd(EventHandler* eh)
                return false;
 
        if (ref[fd])
-               DelFd(ref[fd]);
+               return false;
 
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
@@ -86,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;
@@ -101,6 +98,9 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
                return false;
        }
 
+       ref[fd] = NULL;
+       CurrentSetSize--;
+
        ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
        return true;
 }