X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=01daaee86b6dfc1262e9e388efc1256ac461d77d;hb=2b51585f8be4fe954b07416f75787ca48f1f1a27;hp=1def9b5828f72bb4114fdf3bba1a7b8c2eea9c34;hpb=bf6ec00f3dc5ae23da1e8a4e20d44555eca0593a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 1def9b582..01daaee86 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,129 +2,84 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include "globals.h"
+#include "inspircd.h"
+#include "configreader.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
-
-DLLManager::DLLManager(char *fname)
+DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
-#ifdef STATIC_LINK
-	this->staticname[0] = '\0';
-	log(DEBUG,"Loading core-compiled module '%s'",fname);
-	for (int j = 0; modsyms[j].name; j++)
+	err = NULL;
+
+	if (!strstr(fname,".so"))
 	{
-		log(DEBUG,"Check %s",modsyms[j].name);
-		if (!strcmp(modsyms[j].name,fname))
-		{
-			log(DEBUG,"Found %s",fname);
-			strlcpy(this->staticname,fname,1020);
-			err = 0;
-			return;
-		}
+		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;
 	}
-	err = "Module is not statically compiled into the ircd";
-#else
-    // Try to open the library now and get any error message.
-	
-	h = dlopen( fname, RTLD_NOW );
-	err = (char*)dlerror();
-#endif
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
-	// close the library if it isn't null
-	if (h != 0)
-	dlclose(h);
-#endif
+	/* close the library */
+	if (h)
+		dlclose(h);
 }
 
 
 
-#ifdef STATIC_LINK
-
-bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
+bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
-	log(DEBUG,"Symbol search...");
-	for (int j = 0; modsyms[j].name; j++)
-	{
-		if (!strcmp(this->staticname,modsyms[j].name))
-		{
-			log(DEBUG,"Loading symbol...");
-			v = modsyms[j].value;
-			err = 0;
-			return true;
-		}
-	}
-	err = "Module symbol missing from the core";
-	return false;
-}
-
-#else
-
-bool DLLManager::GetSymbol(void **v, char *sym_name)
-{
-	// try extract a symbol from the library
-	// get any error message is there is any
+	/*
+	 * 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 );
+		dlerror(); // clear value
+		*v = dlsym(h, sym_name);
 		err = (char*)dlerror();
-		if( err == 0 )
-			return true;
-	    	else
+		if (!*v || err)
 			return false;
 	}
-	else
-	{	
-		return false;
-	}
+	
+	/* succeeded :) */
+	return true;
 }
 
-#endif
-
-DLLFactoryBase::DLLFactoryBase(char *fname, 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
-	
+	/* try get the factory function if there is no error yet */
 	factory_func = 0;
 	
-	if(LastError() == 0)
+	if (!LastError())
 	{
-#ifdef STATIC_LINK
-		GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
-#else
-		GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
-#endif
+		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
+		{
+			throw ModuleException("Missing init_module() entrypoint!");
+		}
 	}
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
+