X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=70d5e7cae8b5a47d278c0199ba381f284889d693;hb=0f87ad0d4b97874823c94a5168a06dcd444ad559;hp=3d2d15b4f4cb3c65ae8a338931d0a996e4259758;hpb=b5763d79dc615faaf0e17d3349bdd36d593d3584;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 3d2d15b4f..70d5e7cae 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  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.
@@ -11,123 +11,52 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
+#include "inspircd.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #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;
 	}
-#ifdef STATIC_LINK
-	this->staticname[0] = '\0';
-	for (int j = 0; modsyms[j].name; j++)
-	{
-		if (!strcmp(modsyms[j].name,fname))
-		{
-			strlcpy(this->staticname,fname,1020);
-			err = 0;
-			return;
-		}
-	}
-	err = "Module is not statically compiled into the ircd";
-#else
+
 	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
 	if (!h)
 	{
-		err = (char*)dlerror();
-		return;
+		err = dlerror();
 	}
-#endif
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
-	// close the library if it isn't null
+	/* close the library */
 	if (h)
 		dlclose(h);
-#endif
-}
-
-
-
-#ifdef STATIC_LINK
-
-bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
-{
-	for (int j = 0; modsyms[j].name; j++)
-	{
-		if (!strcmp(this->staticname,modsyms[j].name))
-		{
-			v = modsyms[j].value;
-			err = 0;
-			return true;
-		}
-	}
-	err = "Module symbol missing from the core";
-	return false;
 }
 
-#else
+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)
-	{
-		return false;
-	}
-	else
-	{	
-		return true;
-	}
-}
-
-#endif
+	if (!h)
+		return NULL;
 
-DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
-{
-	// try get the factory function if there is no error yet
-	factory_func = 0;
-	
-	if (!LastError())
+	init_t initfn;
+	initfn.vptr = dlsym(h, MODULE_INIT_STR);
+	if (!initfn.vptr)
 	{
-#ifdef STATIC_LINK
-		if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
-#else
-		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
-#endif
-		{
-			throw ModuleException("Missing init_module() entrypoint!");
-		}
+		err = dlerror();
+		return NULL;
 	}
-}
 
-DLLFactoryBase::~DLLFactoryBase()
-{
+	return (*initfn.fptr)();
 }
-