X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=1def9b5828f72bb4114fdf3bba1a7b8c2eea9c34;hb=0dbb612a36296bff93db35abec4e87dc9bba1795;hp=e9cddcbbf91ac46020f2bb3b0bc561284315a983;hpb=73b9d0c5cb02f0ea8350de28bc3687e0af70ea0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index e9cddcbbf..1def9b582 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,70 +1,130 @@
+/*       +------------------------------------+
+ *       | 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.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
+#include "inspircd_config.h"
 #include "globals.h"
-#include <dlfcn.h>
 #include "dynamic.h"
 
+#ifndef STATIC_LINK
+#include <dlfcn.h>
+#else
+#include "modlist.h"
+#endif
 
+#include "inspstring.h"
+#include "helperfuncs.h"
 
-DLLManager::DLLManager( const char *fname )
+DLLManager::DLLManager(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++)
+	{
+		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 = "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=dlerror();
+	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);
+	if (h != 0)
+	dlclose(h);
+#endif
+}
+
+
+
+#ifdef STATIC_LINK
+
+bool DLLManager::GetSymbol(initfunc* &v, 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,
-			   const char *sym_name
-			   )
+bool DLLManager::GetSymbol(void **v, char *sym_name)
 {
 	// try extract a symbol from the library
 	// get any error message is there is any
 	
-	if( h!=0 )
+	if(h != 0)
 	{
 		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
+		err = (char*)dlerror();
+		if( err == 0 )
+			return true;
+	    	else
+			return false;
 	}
 	else
 	{	
-        return false;
+		return false;
 	}
-	
 }
 
+#endif
 
-DLLFactoryBase::DLLFactoryBase(
-			       const char *fname,
-			       const char *factory=0
-			       ) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(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() == 0)
+	{
+#ifdef STATIC_LINK
+		GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
+#else
+		GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
+#endif
 	}
-	
 }
 
 
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
-
-
-