X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=637a57db4552c7d6c415ee5e44a1aca24335e590;hb=37fd031da06761c8a050105b55d73a8ab499fb74;hp=511651941d609df21c3cddb8748eb8b03279a71c;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 511651941..637a57db4 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -11,29 +11,25 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "dynamic.h"
 #ifndef WIN32
 #include <dlfcn.h>
 #endif
 
-DLLManager::DLLManager(InspIRCd*, 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);
+	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL|RTLD_NODELETE);
 	if (!h)
 	{
-		err = (char*)dlerror();
-		return;
+		err = dlerror();
 	}
 }
 
@@ -44,24 +40,23 @@ DLLManager::~DLLManager()
 		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)
+		return NULL;
 
-	if (h)
+	init_t initfn;
+	initfn.vptr = dlsym(h, MODULE_INIT_STR);
+	if (!initfn.vptr)
 	{
-		dlerror(); // clear value
-		*v = dlsym(h, sym_name);
-		err = (char*)dlerror();
-		if (!*v || err)
-			return false;
+		err = dlerror();
+		return NULL;
 	}
 
-	/* succeeded :) */
-	return true;
+	return (*initfn.fptr)();
 }