Release v3.0.0 alpha 8.

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

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index f44346ad888cf7bc413b983578930343d7713ad4..03f0aca62a04de54ab73137d0439dccc0f88888a 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -35,7 +35,7 @@ namespace
 
 void SocketEngine::Init()
 {
-       MAX_DESCRIPTORS = FD_SETSIZE;
+       MaxSetSize = FD_SETSIZE;
 
        FD_ZERO(&ReadSet);
        FD_ZERO(&WriteSet);
@@ -53,7 +53,11 @@ void SocketEngine::RecoverFromFork()
 bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
        int fd = eh->GetFd();
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+
+       if (fd < 0)
+               return false;
+
+       if (static_cast<size_t>(fd) >= GetMaxFds())
                return false;
 
        if (!SocketEngine::AddFdRef(eh))
@@ -73,7 +77,10 @@ void SocketEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+       if (fd < 0)
+               return;
+
+       if (static_cast<size_t>(fd) >= GetMaxFds())
                return;
 
        SocketEngine::DelFdRef(eh);
@@ -141,26 +148,24 @@ int SocketEngine::DispatchEvents()
                        if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
                                errcode = errno;
 
-                       ev->HandleEvent(EVENT_ERROR, errcode);
+                       ev->OnEventHandlerError(errcode);
                        continue;
                }
 
                if (has_read)
                {
-                       stats.ReadEvents++;
                        ev->SetEventMask(ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
-                       ev->HandleEvent(EVENT_READ);
+                       ev->OnEventHandlerRead();
                        if (ev != GetRef(i))
                                continue;
                }
 
                if (has_write)
                {
-                       stats.WriteEvents++;
                        int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
                        SocketEngine::OnSetEvent(ev, ev->GetEventMask(), newmask);
                        ev->SetEventMask(newmask);
-                       ev->HandleEvent(EVENT_WRITE);
+                       ev->OnEventHandlerWrite();
                }
        }