Untested, new clever pointer voodoo class for binary-safe ziplinks output buffers

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

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index abc1b953ba3d80f53931f831e3b20c26dc7a74df..b7a9c35976b16a028a768a691a2c309ddb597f3c 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;
        }
 
@@ -147,22 +147,26 @@ int SelectEngine::DispatchEvents()
                                {
                                        if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
                                                errcode = errno;
-                                       ev[i]->HandleEvent(EVENT_ERROR, errcode);
+
+                                       v[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());
-                       if (writeable[ev[i]->GetFd()])
+                       if (ev[i])
                        {
-                               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);
+                               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);
+                               }
                        }
                }
        }