X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=70d5e7cae8b5a47d278c0199ba381f284889d693;hb=a8878569083bfa4753e9e118adee0ed1da6a0325;hp=4c822e4ca0a980e36c210437185443d5bc150a3b;hpb=61b45c935dbb50c280970c9f431fd1c7ef4eb680;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 4c822e4ca..70d5e7cae 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,70 +1,62 @@
-#include "globals.h"
-#include <dlfcn.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 #include "dynamic.h"
+#ifndef WIN32
+#include <dlfcn.h>
+#endif
 
-
-
-DLLManager::DLLManager( const char *fname )
-{
-    // Try to open the library now and get any error message.
-	
-	h=dlopen( fname, RTLD_NOW );
-	err=dlerror();
-}
-
-DLLManager::~DLLManager()
-{
-	// close the library if it isn't null
-	if( h!=0 )
-    	dlclose(h);
-}
-
-
-bool DLLManager::GetSymbol( 
-			   void **v,
-			   const char *sym_name
-			   )
+DLLManager::DLLManager(const char *fname)
 {
-	// try extract a symbol from the library
-	// get any error message is there is any
-	
-	if( h!=0 )
+	if (!strstr(fname,".so"))
 	{
-		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
+		err = "This doesn't look like a module file to me...";
+		h = NULL;
+		return;
 	}
-	else
-	{	
-        return false;
+
+	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+	if (!h)
+	{
+		err = dlerror();
 	}
-	
 }
 
-
-DLLFactoryBase::DLLFactoryBase(
-			       const char *fname,
-			       const char *factory
-			       ) : DLLManager(fname)
+DLLManager::~DLLManager()
 {
-	// try get the factory function if there is no error yet
-	
-	factory_func=0;
-	
-	if( LastError()==0 )
-	{		
-    	GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
-	}
-	
+	/* close the library */
+	if (h)
+		dlclose(h);
 }
 
+union init_t {
+	void* vptr;
+	Module* (*fptr)();
+};
 
-DLLFactoryBase::~DLLFactoryBase()
+Module* DLLManager::callInit()
 {
-}
-
+	if (!h)
+		return NULL;
 
+	init_t initfn;
+	initfn.vptr = dlsym(h, MODULE_INIT_STR);
+	if (!initfn.vptr)
+	{
+		err = dlerror();
+		return NULL;
+	}
 
+	return (*initfn.fptr)();
+}