X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_ports.cpp;h=e5523acb6152e5a6e9e1b6dd91050c05babbf6db;hb=5867fa1f677630c3362db7b6dcccd00495fbac37;hp=23a3c3a4525cc340e420b0b51dfc59d3f57ed2c5;hpb=7e46119759b7099c38f543bd38d0186b9806542f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index 23a3c3a45..e5523acb6 100644
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -14,18 +14,6 @@
 #include "inspircd.h"
 #include "exitcodes.h"
 #include <port.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_PORTS__
 #define __SOCKETENGINE_PORTS__
@@ -60,7 +48,7 @@ public:
 	virtual ~PortsEngine();
 	virtual bool AddFd(EventHandler* eh, int event_mask);
 	void OnSetEvent(EventHandler* eh, int old_event, int new_event);
-	virtual bool DelFd(EventHandler* eh, bool force = false);
+	virtual void DelFd(EventHandler* eh);
 	virtual int DispatchEvents();
 	virtual std::string GetName();
 	virtual void WantWrite(EventHandler* eh);
@@ -143,11 +131,11 @@ void PortsEngine::WantWrite(EventHandler* eh, int old_mask, int new_mask)
 		port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), mask_to_events(new_mask), eh);
 }
 
-bool PortsEngine::DelFd(EventHandler* eh, bool force)
+void PortsEngine::DelFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 	if ((fd < 0) || (fd > GetMaxFds() - 1))
-		return false;
+		return;
 
 	port_dissociate(EngineHandle, PORT_SOURCE_FD, fd);
 
@@ -197,6 +185,8 @@ int PortsEngine::DispatchEvents()
 					{
 						ReadEvents++;
 						eh->HandleEvent(EVENT_READ);
+						if (eh != ref[fd])
+							continue;
 					}
 					if (events[i].portev_events & POLLWRNORM)
 					{