Merge pull request #1018 from SaberUK/insp20+hidekills

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index ab1e6fa9b9ff2b53697dc08afcc2da0630012845..3a6a151cb5d047db124b4caca75d1a8063c0a1bf 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,90 +1,111 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "configreader.h"
+
+#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
 
-#include "inspircd.h"
-
-DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
+DLLManager::DLLManager(const char *fname)
 {
-       err = NULL;
-
        if (!strstr(fname,".so"))
        {
                err = "This doesn't look like a module file to me...";
+               h = NULL;
                return;
        }
 
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               err = (char*)dlerror();
-               return;
+#ifdef _WIN32
+               RetrieveLastError();
+#else
+               err = dlerror();
+#endif
        }
 }
 
 DLLManager::~DLLManager()
 {
-       // close the library if it isn't null
+       /* close the library */
        if (h)
                dlclose(h);
 }
 
+union init_t {
+       void* vptr;
+       Module* (*fptr)();
+};
 
-
-bool DLLManager::GetSymbol(void** v, const char* sym_name)
+Module* DLLManager::CallInit()
 {
-       // try extract a symbol from the library
-       // get any error message is there is any
-       
-       if (h)
-       {
-               dlerror(); // clear value
-               *v = dlsym(h, sym_name);
-               err = (char*)dlerror();
-               if (!*v || err)
-                       return false;
-       }
-       
-       if (err)
+       if (!h)
+               return NULL;
+
+       init_t initfn;
+       initfn.vptr = dlsym(h, MODULE_INIT_STR);
+       if (!initfn.vptr)
        {
-               return false;
-       }
-       else
-       {       
-               return true;
+#ifdef _WIN32
+               RetrieveLastError();
+#else
+               err = dlerror();
+#endif
+               return NULL;
        }
+
+       return (*initfn.fptr)();
 }
 
-DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
+std::string DLLManager::GetVersion()
 {
-       // try get the factory function if there is no error yet
-       factory_func = 0;
-       
-       if (!LastError())
-       {
-               if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
-               {
-                       throw ModuleException("Missing init_module() entrypoint!");
-               }
-       }
+       if (!h)
+               return "";
+
+       const char* srcver = (char*)dlsym(h, "inspircd_src_version");
+       if (srcver)
+               return srcver;
+       return "Unversioned module";
 }
 
-DLLFactoryBase::~DLLFactoryBase()
+#ifdef _WIN32
+void DLLManager::RetrieveLastError()
 {
-}
+       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;
 
+       std::string::size_type p;
+       while ((p = err.find_last_of("\r\n")) != std::string::npos)
+               err.erase(p, 1);
+}
+#endif