Added <options:notimesync> to the example config

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index c3c0c89a21b813e6d60283ea7d93a1379ac89f62..54d6ff7c1eca2e0e19bbf5adc9096cac747d30e3 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -83,7 +83,7 @@ void EPollEngine::WantWrite(EventHandler* eh)
         * status for us and saves us a call.
         */
        struct epoll_event ev;
-       ev.events = EPOLLOUT | EPOLLONESHOT;
+       ev.events = EPOLLOUT;
        ev.data.fd = eh->GetFd();
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
        if (i < 0)
@@ -130,10 +130,27 @@ int EPollEngine::GetRemainingFds()
 
 int EPollEngine::DispatchEvents()
 {
+       socklen_t codesize;
+       int errcode;
        int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 150);
        for (int j = 0; j < i; j++)
        {
                ServerInstance->Log(DEBUG,"Handle %s event on fd %d",events[j].events & EPOLLOUT ? "write" : "read", events[j].data.fd);
+               if (events[j].events & EPOLLHUP)
+               {
+                       ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd);
+                       ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
+                       continue;
+               }
+               if (events[j].events & EPOLLERR)
+               {
+                       /* Get error number */
+                       if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+                               errcode = errno;
+                       ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode));
+                       ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
+                       continue;
+               }
                if (events[j].events & EPOLLOUT)
                {
                        struct epoll_event ev;
@@ -144,11 +161,13 @@ int EPollEngine::DispatchEvents()
                        {
                                ServerInstance->Log(DEBUG,"epoll: Could not reset fd %d!", events[j].data.fd);
                        }
-                       ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
                }
                else
                {
-                       ref[events[j].data.fd]->HandleEvent(EVENT_READ);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_READ);
                }
        }