Fix null dereference caused by tracking dummy

[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 1a783153eae944ad333f0a9cdd4b656b92c22d11..0550ae051f856aa861ffb5c3d53dbeaf7a1d758c 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -16,7 +16,61 @@
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
-#include "socketengines/socketengine_kqueue.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef __SOCKETENGINE_KQUEUE__
+#define __SOCKETENGINE_KQUEUE__
+
+#include <vector>
+#include <string>
+#include <map>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+#include "socketengine.h"
+
+/** A specialisation of the SocketEngine class, designed to use FreeBSD kqueue().
+ */
+class KQueueEngine : public SocketEngine
+{
+private:
+       int EngineHandle;
+       /** These are used by kqueue() to hold socket events
+        */
+       struct kevent* ke_list;
+       /** This is a specialised time value used by kqueue()
+        */
+       struct timespec ts;
+public:
+       /** Create a new KQueueEngine
+        */
+       KQueueEngine();
+       /** Delete a KQueueEngine
+        */
+       virtual ~KQueueEngine();
+       bool AddFd(EventHandler* eh, int event_mask);
+       void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
+       virtual bool DelFd(EventHandler* eh, bool force = false);
+       virtual int DispatchEvents();
+       virtual std::string GetName();
+       virtual void RecoverFromFork();
+};
+
+#endif
+
 #include <sys/sysctl.h>
 
 KQueueEngine::KQueueEngine()
@@ -76,13 +130,9 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
                return false;
        }
 
-       if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) {
-               // ...and sometimes want to write
-               WantWrite(eh);
-       }
-
        ref[fd] = eh;
        SocketEngine::SetEventMask(eh, event_mask);
+       OnSetEvent(eh, 0, event_mask);
        CurrentSetSize++;
 
        ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
@@ -207,3 +257,8 @@ std::string KQueueEngine::GetName()
 {
        return "kqueue";
 }
+
+SocketEngine* CreateSocketEngine()
+{
+       return new KQueueEngine;
+}