X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=8e63b7d03ee0729738a9a12cd677087cbad969be;hb=5041993a7c5b2b94d84a5c15c4960e6acc3bb52d;hp=c26df56b23cabd36c7b5de994dbe12d9beb81684;hpb=2cbaa284bf7f8579c16c06245726b4c208591b24;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index c26df56b2..8e63b7d03 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 "inspircd_io.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>
+
+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(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 );
+	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
 }
 
@@ -117,9 +165,9 @@ DLLFactoryBase::DLLFactoryBase(char *fname, char *factory) : DLLManager(fname)
 	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
 	}
 }