After discussions and thought, move umode +n to +s. This increases cross-ircd compat...

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

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 0fb14c29f0de9789b8d8f0c22dbf54099242cfcf..7630ffb9865371773f84e963c7b59ca0cd930351 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -17,13 +17,15 @@
 #include <sys/event.h>
 #include <sys/time.h>
 #include "socketengines/socketengine_kqueue.h"
-#include <ulimit.h>
+#include <sys/sysctl.h>
 
 KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
+       MAX_DESCRIPTORS = 0;
        this->RecoverFromFork();
-       ref = new EventHandler* [GetMaxFds()];
        ke_list = new struct kevent[GetMaxFds()];
+       ref = new EventHandler* [GetMaxFds()];
+       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 void KQueueEngine::RecoverFromFork()
@@ -43,7 +45,6 @@ void KQueueEngine::RecoverFromFork()
                ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        CurrentSetSize = 0;
-       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 KQueueEngine::~KQueueEngine()
@@ -104,7 +105,7 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
        CurrentSetSize--;
        ref[fd] = NULL;
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
+       //ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
        return true;
 }
 
@@ -130,9 +131,8 @@ int KQueueEngine::GetMaxFds()
                mib[1] = KERN_MAXFILES;
                len = sizeof(maxfiles);
                sysctl(mib, 2, &maxfiles, &len, NULL, 0);
-
                MAX_DESCRIPTORS = maxfiles;
-               return max;
+               return maxfiles;
        }
        return MAX_DESCRIPTORS;
 }
@@ -170,9 +170,12 @@ int KQueueEngine::DispatchEvents()
                        /* This looks wrong but its right. As above, theres no modify
                         * call in kqueue. See the manpage.
                         */
-                       struct kevent ke;
-                       EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
-                       kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+                       if (ref[ke_list[j].ident]->Readable())
+                       {
+                               struct kevent ke;
+                               EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
+                               kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+                       }
                        WriteEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);