X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=511651941d609df21c3cddb8748eb8b03279a71c;hb=da063380e6437178ee3ea99ead971fa384b93a5e;hp=778a94521d6ddba60be3acb15ae91718ab94a394;hpb=1ff199172d2fd4fa8e7f29dbffd10c684e25e3a9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 778a94521..511651941 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,40 +2,24 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
+/* $Core */
 
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "globals.h"
+#include "inspircd.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
-
-extern ServerConfig* Config;
-
-DLLManager::DLLManager(const char *fname)
+DLLManager::DLLManager(InspIRCd*, const char *fname)
 {
 	err = NULL;
 
@@ -44,169 +28,40 @@ DLLManager::DLLManager(const char *fname)
 		err = "This doesn't look like a module file to me...";
 		return;
 	}
-#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
-	// Copy the library to a temp location, this makes recompiles
-	// a little safer if the ircd is running at the time as the
-	// shared libraries are mmap()ed and not doing this causes
-	// segfaults.
-	/*FILE* x = fopen(fname,"rb");
-	if (!x)
-	{
-		err = strerror(errno);
-		return;
-	}
-	log(DEBUG,"Opened module file %s",fname);
-	char tmpfile_template[255];
-	char buffer[65536];
-	snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",Config->TempDir,getpid());
-	int fd = mkstemp(tmpfile_template);
-	if (fd == -1)
-	{
-		fclose(x);
-		err = strerror(errno);
-		return;
-	}
-	log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
-	while (!feof(x))
-	{
-		int n = fread(buffer, 1, 65535, x);
-		if (n)
-		{
-			int written = write(fd,buffer,n);
-			if (written != n)
-			{
-				fclose(x);
-				err = strerror(errno);
-				return;
-			}
-		}
-	}
-	log(DEBUG,"Copied entire file.");
-	// Try to open the library now and get any error message.
-
-	if (close(fd) == -1)
-		err = strerror(errno);
-	if (fclose(x) == EOF)
-		err = strerror(errno);*/
 
 	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
 	if (!h)
 	{
-		log(DEBUG,"dlerror occured!");
-		err = dlerror();
+		err = (char*)dlerror();
 		return;
 	}
-
-	/*log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
-
-	// We can delete the tempfile once it's loaded, leaving just the inode.
-	if (!err && !Config->debugging)
-	{
-		log(DEBUG,"Deleteting %s",tmpfile_template);
-		if (unlink(tmpfile_template) == -1)
-			err = strerror(errno);
-	}*/
-#endif
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
-	// close the library if it isn't null
+	/* close the library */
 	if (h)
 		dlclose(h);
-#endif
 }
 
 
 
-#ifdef STATIC_LINK
-
-bool DLLManager::GetSymbol(initfunc* &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, const 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)
 	{
-		log(DEBUG,"Found symbol %s", sym_name);
 		dlerror(); // clear value
-		*v = dlsym(h, "init_module");
-		err = dlerror();
-
-		log(DEBUG,"%s",err);
+		*v = dlsym(h, sym_name);
+		err = (char*)dlerror();
 		if (!*v || err)
 			return false;
-
-		log(DEBUG,"%0x %0x",dlsym(h, "init_module"), *v);
-	}
-	
-	if (err)
-	{
-		log(DEBUG,"Not found symbol");
-		return false;
-	}
-	else
-	{	
-		return true;
 	}
-}
-
-#endif
 
-DLLFactoryBase::DLLFactoryBase(const char* fname, const char* factory) : DLLManager(fname)
-{
-	// try get the factory function if there is no error yet
-	factory_func = 0;
-	
-	if (!LastError())
-	{
-#ifdef STATIC_LINK
-		if (!GetSymbol( factory_func, factory ? factory : "init_module" ))
-#else
-		if (!GetSymbol( (void **)&factory_func, factory ? factory : "init_module" ))
-#endif
-		{
-			throw ModuleException("Missing init_module() entrypoint!");
-		}
-	}
+	/* succeeded :) */
+	return true;
 }
-
-DLLFactoryBase::~DLLFactoryBase()
-{
-}
-