X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=3a6a151cb5d047db124b4caca75d1a8063c0a1bf;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=2e787f341de75c52a0eca9926856586702cea7b2;hpb=75e19b2ff35d6b42fe83e7200d3675d81e43ecc1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2e787f341..3a6a151cb 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,130 +1,111 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
 
-#include "globals.h"
-#include "inspircd_config.h"
+#include "inspircd.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef _WIN32
 #include <dlfcn.h>
 #else
-#include "modlist.h"
+#define dlopen(path, state) (void*)LoadLibraryA(path)
+#define dlsym(handle, export) (void*)GetProcAddress((HMODULE)handle, export)
+#define dlclose(handle) FreeLibrary((HMODULE)handle)
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
-
 DLLManager::DLLManager(const char *fname)
 {
-#ifdef STATIC_LINK
-	this->staticname[0] = '\0';
-	log(DEBUG,"Loading core-compiled module '%s'",fname);
-	for (int j = 0; modsyms[j].name; j++)
+	if (!strstr(fname,".so"))
 	{
-		log(DEBUG,"Check %s",modsyms[j].name);
-		if (!strcmp(modsyms[j].name,fname))
-		{
-			log(DEBUG,"Found %s",fname);
-			strlcpy(this->staticname,fname,1020);
-			err = 0;
-			return;
-		}
+		err = "This doesn't look like a module file to me...";
+		h = NULL;
+		return;
 	}
-	err = "Module is not statically compiled into the ircd";
+
+	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+	if (!h)
+	{
+#ifdef _WIN32
+		RetrieveLastError();
 #else
-    // Try to open the library now and get any error message.
-	
-	h = dlopen( fname, RTLD_NOW );
-	err = dlerror();
+		err = dlerror();
 #endif
+	}
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
-	// close the library if it isn't null
-	if (h != 0)
-	dlclose(h);
-#endif
+	/* close the library */
+	if (h)
+		dlclose(h);
 }
 
+union init_t {
+	void* vptr;
+	Module* (*fptr)();
+};
 
-
-#ifdef STATIC_LINK
-
-bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
+Module* DLLManager::CallInit()
 {
-	log(DEBUG,"Symbol search...");
-	for (int j = 0; modsyms[j].name; j++)
-	{
-		if (!strcmp(this->staticname,modsyms[j].name))
-		{
-			log(DEBUG,"Loading symbol...");
-			v = modsyms[j].value;
-			err = 0;
-			return true;
-		}
-	}
-	err = "Module symbol missing from the core";
-	return false;
-}
-
-#else
+	if (!h)
+		return NULL;
 
-bool DLLManager::GetSymbol(void **v, const char *sym_name)
-{
-	// try extract a symbol from the library
-	// get any error message is there is any
-	
-	if(h != 0)
+	init_t initfn;
+	initfn.vptr = dlsym(h, MODULE_INIT_STR);
+	if (!initfn.vptr)
 	{
-		*v = dlsym( h, sym_name );
+#ifdef _WIN32
+		RetrieveLastError();
+#else
 		err = dlerror();
-		if( err == 0 )
-			return true;
-	    	else
-			return false;
-	}
-	else
-	{	
-		return false;
+#endif
+		return NULL;
 	}
-}
 
-#endif
+	return (*initfn.fptr)();
+}
 
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+std::string DLLManager::GetVersion()
 {
-	// try get the factory function if there is no error yet
-	
-	factory_func = 0;
-	
-	if(LastError() == 0)
-	{
-#ifdef STATIC_LINK
-		GetSymbol( factory_func, factory ? factory : "init_module" );
-#else
-		GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
-#endif
-	}
-}
+	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