X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=70d5e7cae8b5a47d278c0199ba381f284889d693;hb=b43fc66c17c2bef6dca66a966676b8128d5774ee;hp=4734c4f63bbe268b4bec17fe3f836936337f4d62;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 4734c4f63..70d5e7cae 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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,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);
 	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)
+	if (!h)
+		return NULL;
+
+	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)();
 }