Only show UHNAMES and NAMESX in 005 if the cap module is loaded.

[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 c969af1fdd8b721ba8931eba19a86df2bb076508..3bd6b187c87cabca64916c0e9b2c233dfc15c034 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -20,11 +20,10 @@
 
 
 #include "inspircd.h"
-#include "exitcodes.h"
+
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
-#include <iostream>
 #include <sys/sysctl.h>
 
 /** A specialisation of the SocketEngine class, designed to use BSD kqueue().
@@ -40,6 +39,20 @@ namespace
        /** Pending changes
         */
        std::vector<struct kevent> changelist(8);
+
+#ifdef __NetBSD__
+       inline intptr_t udata_cast(EventHandler* eh)
+       {
+               // On NetBSD the last parameter of EV_SET is intptr_t.
+               return reinterpret_cast<intptr_t>(eh);
+       }
+#else
+       inline void* udata_cast(EventHandler* eh)
+       {
+               // On other platforms the last parameter of EV_SET is void*.
+               return static_cast<void*>(eh);
+       }
+#endif
 }
 
 /** Initialize the kqueue engine
@@ -59,13 +72,7 @@ void SocketEngine::RecoverFromFork()
         */
        EngineHandle = kqueue();
        if (EngineHandle == -1)
-       {
-               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: this is a fatal error, exiting now.");
-               std::cout << "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features." << std::endl;
-               std::cout << "ERROR: this is a fatal error, exiting now." << std::endl;
-               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
-       }
+               InitError();
 }
 
 /** Shutdown the kqueue engine
@@ -94,7 +101,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 
        // We always want to read from the socket...
        struct kevent* ke = GetChangeKE();
-       EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, static_cast<void*>(eh));
+       EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, udata_cast(eh));
 
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
 
@@ -135,7 +142,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        {
                // new poll-style write
                struct kevent* ke = GetChangeKE();
-               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, static_cast<void*>(eh));
+               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, udata_cast(eh));
        }
        else if ((old_mask & FD_WANT_POLL_WRITE) && !(new_mask & FD_WANT_POLL_WRITE))
        {
@@ -146,7 +153,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        if ((new_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) && !(old_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)))
        {
                struct kevent* ke = GetChangeKE();
-               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, static_cast<void*>(eh));
+               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, udata_cast(eh));
        }
 }
 
@@ -167,8 +174,9 @@ int SocketEngine::DispatchEvents()
 
        for (int j = 0; j < i; j++)
        {
+               // This can't be a static_cast because udata is intptr_t on NetBSD.
                struct kevent& kev = ke_list[j];
-               EventHandler* eh = static_cast<EventHandler*>(kev.udata);
+               EventHandler* eh = reinterpret_cast<EventHandler*>(kev.udata);
                if (!eh)
                        continue;