X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=0d719755a7b373748ce768ea6a5f3fc8a884aebe;hb=9bc8b2602426e187c4c5ba6ff0fad0641155357a;hp=9cc68fc5f3d36aa7a9169ca482e9eda102a16f33;hpb=9f1bd74b09810565502451047b06b6eca7e47f7f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 9cc68fc5f..0d719755a 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,78 +2,86 @@
  *       | Inspire 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.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include "globals.h"
-#include <dlfcn.h>
+#include "configreader.h"
 #include "dynamic.h"
-#include "inspstring.h"
+#include <dlfcn.h>
+#include "inspircd.h"
 
-DLLManager::DLLManager(const char *fname)
+DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
-    // Try to open the library now and get any error message.
-	
-	h=dlopen( fname, RTLD_NOW );
-	err=dlerror();
+	err = NULL;
+
+	if (!strstr(fname,".so"))
+	{
+		err = "This doesn't look like a module file to me...";
+		return;
+	}
+
+	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+	if (!h)
+	{
+		err = (char*)dlerror();
+		return;
+	}
 }
 
 DLLManager::~DLLManager()
 {
 	// close the library if it isn't null
-	if (h!=0)
-    	dlclose(h);
+	if (h)
+		dlclose(h);
 }
 
 
-bool DLLManager::GetSymbol(void **v, const char *sym_name)
+
+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 )
+	if (h)
 	{
-		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
+		dlerror(); // clear value
+		*v = dlsym(h, sym_name);
+		err = (char*)dlerror();
+		if (!*v || err)
+			return false;
+	}
+	
+	if (err)
+	{
+		return false;
 	}
 	else
 	{	
-        return false;
+		return true;
 	}
-	
 }
 
-
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+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;
 	
-	factory_func=0;
-	
-	if( LastError()==0 )
-	{		
-    	GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+	if (!LastError())
+	{
+		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
+		{
+			throw ModuleException("Missing init_module() entrypoint!");
+		}
 	}
-	
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
 
-
-