Add irc::dynamicbitmask class. Feel free to take a look and offer suggestions, as...

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

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index a26c28e517d77e2c0badd8bbf507a602f6aef5d4..19a2ec882af10b1eff96e423db52f4d059c45996 100644 (file)
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -37,12 +37,12 @@ bool SelectEngine::AddFd(EventHandler* eh)
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
-               ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+               ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
                return false;
        }
        if (GetRemainingFds() <= 1)
        {
-               ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
+               ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
                return false;
        }
 
@@ -100,6 +100,8 @@ int SelectEngine::DispatchEvents()
        timeval tval;
        int sresult = 0;
        EventHandler* ev[MAX_DESCRIPTORS];
+       socklen_t codesize;
+       int errcode;
 
        FD_ZERO(&wfdset);
        FD_ZERO(&rfdset);
@@ -139,10 +141,14 @@ int SelectEngine::DispatchEvents()
        {
                if (ev[i])
                {
-                       if (FD_ISSET (a->second, &errfdset))
+                       if (FD_ISSET (ev[i]->GetFd(), &errfdset))
                        {
                                if (ev[i])
-                                       ev[i]->HandleEvent(EVENT_ERROR, 0);
+                               {
+                                       if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+                                               errcode = errno;
+                                       ev[i]->HandleEvent(EVENT_ERROR, errcode);
+                               }
                                continue;
                        }
                        ServerInstance->Log(DEBUG,"Handle %s event on fd %d",writeable[ev[i]->GetFd()] || !ev[i]->Readable() ? "write" : "read", ev[i]->GetFd());