X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=3d2d15b4f4cb3c65ae8a338931d0a996e4259758;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=d18854dc6ada1a2c155328b85621eff8077c396f;hpb=e81bad456aa55af8b0cb31d2ffeb0672ff0c6bbf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index d18854dc6..3d2d15b4f 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,64 +1,133 @@
-#include "globals.h"
-#include <dlfcn.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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 "configreader.h"
 #include "dynamic.h"
 
+#ifndef STATIC_LINK
+#include <dlfcn.h>
+#else
+#include "modlist.h"
+#endif
 
+#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;
+	}
+#ifdef STATIC_LINK
+	this->staticname[0] = '\0';
+	for (int j = 0; modsyms[j].name; j++)
+	{
+		if (!strcmp(modsyms[j].name,fname))
+		{
+			strlcpy(this->staticname,fname,1020);
+			err = 0;
+			return;
+		}
+	}
+	err = "Module is not statically compiled into the ircd";
+#else
+	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
+	if (!h)
+	{
+		err = (char*)dlerror();
+		return;
+	}
+#endif
 }
 
 DLLManager::~DLLManager()
 {
+#ifndef STATIC_LINK
 	// close the library if it isn't null
-	if( h!=0 )
-    	dlclose(h);
+	if (h)
+		dlclose(h);
+#endif
 }
 
 
-bool DLLManager::GetSymbol(void **v, const char *sym_name)
+
+#ifdef STATIC_LINK
+
+bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
+{
+	for (int j = 0; modsyms[j].name; j++)
+	{
+		if (!strcmp(this->staticname,modsyms[j].name))
+		{
+			v = modsyms[j].value;
+			err = 0;
+			return true;
+		}
+	}
+	err = "Module symbol missing from the core";
+	return false;
+}
+
+#else
+
+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)
+	{
+		dlerror(); // clear value
+		*v = dlsym(h, sym_name);
+		err = (char*)dlerror();
+		if (!*v || err)
+			return false;
+	}
+	
+	if (err)
 	{
-		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
+		return false;
 	}
 	else
 	{	
-        return false;
+		return true;
 	}
-	
 }
 
+#endif
 
-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())
+	{
+#ifdef STATIC_LINK
+		if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
+#else
+		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
+#endif
+		{
+			throw ModuleException("Missing init_module() entrypoint!");
+		}
 	}
-	
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
 
-
-