Merge pull request #16 from Adam-/insp20

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

diff --git a/src/socketengines/socketengine_poll.cpp b/src/socketengines/socketengine_poll.cpp
index f30cd1fed81330c1ede9e45136e977973774cf71..d20ac35a205e47f45f8ef8a51aab72052731a9a3 100644 (file)
--- a/src/socketengines/socketengine_poll.cpp
+++ b/src/socketengines/socketengine_poll.cpp
@@ -13,18 +13,6 @@
 
 #include "inspircd.h"
 #include "exitcodes.h"
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
- *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
- *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
- *
- * ---------------------------------------------------
- */
 
 #ifndef __SOCKETENGINE_POLL__
 #define __SOCKETENGINE_POLL__
@@ -71,7 +59,7 @@ public:
        virtual bool AddFd(EventHandler* eh, int event_mask);
        virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
        virtual EventHandler* GetRef(int fd);
-       virtual bool DelFd(EventHandler* eh, bool force = false);
+       virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
        virtual std::string GetName();
 };
@@ -180,20 +168,20 @@ void PollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        events[it->second].events = mask_to_poll(new_mask);
 }
 
-bool PollEngine::DelFd(EventHandler* eh, bool force)
+void PollEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
                ServerInstance->Logs->Log("SOCKET", DEBUG, "DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds());
-               return false;
+               return;
        }
 
        std::map<int, unsigned int>::iterator it = fd_mappings.find(fd);
        if (it == fd_mappings.end())
        {
                ServerInstance->Logs->Log("SOCKET",DEBUG,"DelFd() on unknown fd: %d", fd);
-               return false;
+               return;
        }
 
        unsigned int index = it->second;
@@ -225,7 +213,6 @@ bool PollEngine::DelFd(EventHandler* eh, bool force)
 
        ServerInstance->Logs->Log("SOCKET", DEBUG, "Remove file descriptor: %d (index: %d) "
                        "(Filled gap with: %d (index: %d))", fd, index, last_fd, last_index);
-       return true;
 }
 
 int PollEngine::DispatchEvents()
@@ -235,6 +222,7 @@ int PollEngine::DispatchEvents()
        socklen_t codesize = sizeof(int);
        int errcode;
        int processed = 0;
+       ServerInstance->UpdateTime();
 
        if (i > 0)
        {
@@ -268,6 +256,9 @@ int PollEngine::DispatchEvents()
                        {
                                SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
                                eh->HandleEvent(EVENT_READ);
+                               if (eh != ref[index])
+                                       // whoops, deleted out from under us
+                                       continue;
                        }
                        
                        if (events[index].revents & POLLOUT)