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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2e787f341..d9ace43e0 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,19 @@ using namespace std;
 
 #include "inspstring.h"
 #include "helperfuncs.h"
+#include <unistd.h>
+#include <sys/types.h>
+#include <stdio.h>
 
-DLLManager::DLLManager(const char *fname)
+extern ServerConfig* Config;
+
+DLLManager::DLLManager(char *fname)
 {
+	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 +58,47 @@ 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.
+#ifdef IS_CYGWIN
+	// Cygwin behaviour is handled slightly differently
+	// With the advent of dynamic modules. Because Windows
+	// wont let you overwrite a file which is currently in
+	// Use, we can safely attempt to load the module from its
+	// Current location :)
+
+	h = dlopen(fname, RTLD_NOW );
+	err = (char*)dlerror();
+
+#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 = "Module file not found or cannot access, game over man!";
+		return;
+	}
+	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);
+	while (!feof(x))
+	{
+		int n = fread(buffer, 1, 65535, x);
+		if (n)
+			write(fd,buffer,n);
+	}
+	
+	// Try to open the library now and get any error message.
 	
-	h = dlopen( fname, RTLD_NOW );
-	err = dlerror();
+	h = dlopen(tmpfile_template, RTLD_NOW );
+	err = (char*)dlerror();
+	close(fd);
+	// We can delete the tempfile once it's loaded, leaving just the inode.
+	if (!Config->debugging)
+		unlink(tmpfile_template);
+#endif
 #endif
 }
 
@@ -67,7 +115,7 @@ DLLManager::~DLLManager()
 
 #ifdef STATIC_LINK
 
-bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
+bool DLLManager::GetSymbol(initfunc* &v, char *sym_name)
 {
 	log(DEBUG,"Symbol search...");
 	for (int j = 0; modsyms[j].name; j++)
@@ -86,7 +134,7 @@ bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 
 #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
@@ -94,7 +142,7 @@ bool DLLManager::GetSymbol(void **v, const char *sym_name)
 	if(h != 0)
 	{
 		*v = dlsym( h, sym_name );
-		err = dlerror();
+		err = (char*)dlerror();
 		if( err == 0 )
 			return true;
 	    	else
@@ -108,7 +156,7 @@ bool DLLManager::GetSymbol(void **v, const char *sym_name)
 
 #endif
 
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
+DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
 {
 	// try get the factory function if there is no error yet
 	
@@ -117,9 +165,9 @@ DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLMana
 	if(LastError() == 0)
 	{
 #ifdef STATIC_LINK
-		GetSymbol( factory_func, factory ? factory : "init_module" );
+		GetSymbol( factory_func, factory ? factory : (char*)"init_module" );
 #else
-		GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
+		GetSymbol( (void **)&factory_func, factory ? factory : (char*)"init_module" );
 #endif
 	}
 }