Merge pull request #16 from Adam-/insp20

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

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 795e844e6ac58cb4dd09c1ba848f79d038e10f28..acc8f8f09dc7f158c69eacffbf685dbac3f91dc1 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -32,7 +32,7 @@ public:
         */
        virtual ~SelectEngine();
        virtual bool AddFd(EventHandler* eh, int event_mask);
-       virtual bool DelFd(EventHandler* eh, bool force = false);
+       virtual void DelFd(EventHandler* eh);
        void OnSetEvent(EventHandler* eh, int, int);
        virtual int DispatchEvents();
        virtual std::string GetName();
@@ -69,18 +69,17 @@ bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
        return true;
 }
 
-bool SelectEngine::DelFd(EventHandler* eh, bool force)
+void SelectEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
        if ((fd < 0) || (fd > GetMaxFds() - 1))
-               return false;
+               return;
 
        CurrentSetSize--;
        ref[fd] = NULL;
 
        ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-       return true;
 }
 
 void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
@@ -151,6 +150,8 @@ int SelectEngine::DispatchEvents()
                                        ReadEvents++;
                                        SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
                                        ev->HandleEvent(EVENT_READ);
+                                       if (ev != ref[i])
+                                               continue;
                                }
                                if (FD_ISSET (i, &wfdset))
                                {