X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=c75371a39b33cdbf73d3c1684dab430ea4a9e0fa;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=2e787f341de75c52a0eca9926856586702cea7b2;hpb=75e19b2ff35d6b42fe83e7200d3675d81e43ecc1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2e787f341..c75371a39 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -16,8 +16,9 @@
 
 using namespace std;
 
-#include "globals.h"
 #include "inspircd_config.h"
+#include "configreader.h"
+#include "globals.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
@@ -28,9 +29,21 @@ using namespace std;
 
 #include "inspstring.h"
 #include "helperfuncs.h"
+#include <unistd.h>
+#include <sys/types.h>
+#include <stdio.h>
+
+extern InspIRCd* ServerInstance;
 
 DLLManager::DLLManager(const char *fname)
 {
+	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';
 	log(DEBUG,"Loading core-compiled module '%s'",fname);
@@ -47,10 +60,67 @@ DLLManager::DLLManager(const char *fname)
 	}
 	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();
+	// 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",ServerInstance->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 = (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 && !ServerInstance->Config->debugging)
+	{
+		log(DEBUG,"Deleteting %s",tmpfile_template);
+		if (unlink(tmpfile_template) == -1)
+			err = strerror(errno);
+	}
 #endif
 }
 
@@ -58,8 +128,8 @@ DLLManager::~DLLManager()
 {
 #ifndef STATIC_LINK
 	// close the library if it isn't null
-	if (h != 0)
-	dlclose(h);
+	if (h)
+		dlclose(h);
 #endif
 }
 
@@ -86,45 +156,52 @@ bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 
 #else
 
-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
+		log(DEBUG,"Found symbol %s", sym_name);
+		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;
 	}
 }
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(const char* fname, const char* symbol) : DLLManager(fname)
 {
 	// 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 : "init_module" );
+		if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
 #else
-		GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
 #endif
+		{
+			throw ModuleException("Missing init_module() entrypoint!");
+		}
 	}
 }
 
-
 DLLFactoryBase::~DLLFactoryBase()
 {
 }
+