Ignore clients on ulined servers when reporting stats in LUSERS.

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 27662a3516bccbc704fec1655e83a6692c7e611b..f2acdd51c6c11736ca62f42bf8bc53a85b4b64b6 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -22,9 +22,13 @@
 
 
 #include "inspircd.h"
-#include "dynamic.h"
-#ifndef WIN32
+
+#ifndef _WIN32
 #include <dlfcn.h>
+#else
+#define dlopen(path, state) (void*)LoadLibraryA(path)
+#define dlsym(handle, export) (void*)GetProcAddress((HMODULE)handle, export)
+#define dlclose(handle) FreeLibrary((HMODULE)handle)
 #endif
 
 DLLManager::DLLManager(const char *fname)
@@ -39,7 +43,7 @@ DLLManager::DLLManager(const char *fname)
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               err = dlerror();
+               RetrieveLastError();
        }
 }
 
@@ -50,34 +54,47 @@ DLLManager::~DLLManager()
                dlclose(h);
 }
 
-union init_t {
-       void* vptr;
-       Module* (*fptr)();
-};
-
 Module* DLLManager::CallInit()
 {
-       if (!h)
-               return NULL;
-
-       init_t initfn;
-       initfn.vptr = dlsym(h, MODULE_INIT_STR);
-       if (!initfn.vptr)
+       union
        {
-               err = dlerror();
+               void* vptr;
+               Module* (*fptr)();
+       };
+
+       vptr = GetSymbol(MODULE_INIT_STR);
+       if (!vptr)
                return NULL;
-       }
 
-       return (*initfn.fptr)();
+       return (*fptr)();
+}
+
+void* DLLManager::GetSymbol(const char* name)
+{
+       return h ? dlsym(h, name) : NULL;
 }
 
 std::string DLLManager::GetVersion()
 {
-       if (!h)
-               return "";
+       const char* srcver = static_cast<const char*>(GetSymbol("inspircd_src_version"));
+       return srcver ? srcver : "";
+}
+
+void DLLManager::RetrieveLastError()
+{
+#if defined _WIN32
+       char errmsg[500];
+       DWORD dwErrorCode = GetLastError();
+       if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0)
+               sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode);
+       SetLastError(ERROR_SUCCESS);
+       err = errmsg;
+#else
+       const char* errmsg = dlerror();
+       err = errmsg ? errmsg : "Unknown error";
+#endif
 
-       const char* srcver = (char*)dlsym(h, "inspircd_src_version");
-       if (srcver)
-               return srcver;
-       return "Unversioned module";
+       std::string::size_type p;
+       while ((p = err.find_last_of("\r\n")) != std::string::npos)
+               err.erase(p, 1);
 }