Error set handlin g for select socketengine, tidyup epoll

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

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index 8b0379152b0d6a8f30d913b4129847ff5cd20982..a26c28e517d77e2c0badd8bbf507a602f6aef5d4 100644 (file)
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -103,6 +103,7 @@ int SelectEngine::DispatchEvents()
 
        FD_ZERO(&wfdset);
        FD_ZERO(&rfdset);
+       FD_ZERO(&errfdset);
 
        for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
        {
@@ -112,15 +113,17 @@ int SelectEngine::DispatchEvents()
                        FD_SET (a->second, &wfdset);
                if (writeable[a->second])
                        FD_SET (a->second, &wfdset);
+
+               FD_SET (a->second, &errfdset);
        }
        tval.tv_sec = 0;
        tval.tv_usec = 50L;
-       sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
+       sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
        if (sresult > 0)
        {
                for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
                {
-                       if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)))
+                       if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset))
                        {
                                ev[result++] = ref[a->second];
                        }
@@ -134,16 +137,27 @@ int SelectEngine::DispatchEvents()
         */
        for (int i = 0; i < result; i++)
        {
-               ServerInstance->Log(DEBUG,"Handle %s event on fd %d",writeable[ev[i]->GetFd()] || !ev[i]->Readable() ? "write" : "read", ev[i]->GetFd());
-               if (writeable[ev[i]->GetFd()])
-               {
-                       ev[i]->HandleEvent(EVENT_WRITE);
-                       writeable[ev[i]->GetFd()] = false;
-
-               }
-               else
+               if (ev[i])
                {
-                       ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+                       if (FD_ISSET (a->second, &errfdset))
+                       {
+                               if (ev[i])
+                                       ev[i]->HandleEvent(EVENT_ERROR, 0);
+                               continue;
+                       }
+                       ServerInstance->Log(DEBUG,"Handle %s event on fd %d",writeable[ev[i]->GetFd()] || !ev[i]->Readable() ? "write" : "read", ev[i]->GetFd());
+                       if (writeable[ev[i]->GetFd()])
+                       {
+                               if (ev[i])
+                                       ev[i]->HandleEvent(EVENT_WRITE);
+                               writeable[ev[i]->GetFd()] = false;
+       
+                       }
+                       else
+                       {
+                               if (ev[i])
+                                       ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+                       }
                }
        }