Refactor port binding, warning not yet tested fully

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

diff --git a/src/socketengine_ports.cpp b/src/socketengine_ports.cpp
index f036a8e10ef1c03c4196ce6088148ca05c881e2e..5a8c616a5b5566cd56202c36ea0fe6082b451402 100644 (file)
--- a/src/socketengine_ports.cpp
+++ b/src/socketengine_ports.cpp
@@ -104,10 +104,17 @@ int PortsEngine::DispatchEvents()
        {
                switch (this->events[i].portev_source)
                {
-               case PORT_SOURCE_FD:
-                       int fd = this->events[i].portev_object;
-                       ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE);
-               default:
+                       case PORT_SOURCE_FD:
+                       {
+                               int fd = this->events[i].portev_object;
+                               if (ref[fd])
+                               {
+                                       // reinsert port for next time around
+                                       port_associate(EngineHandle, PORT_SOURCE_FD, fd, POLLRDNORM, ref[fd]);
+                                       ref[fd]->HandleEvent((this->events[i].portev_events & POLLRDNORM) ? EVENT_READ : EVENT_WRITE);
+                               }
+                       }
+                       default:
                        break;
                }
        }