Make loading modules considerably more robust and user friendly.

5 files changed, 60 insertions, 34 deletions

diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 7c9e49550..7936a34d7 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -76,8 +76,8 @@ CmdResult CommandModules::Handle(User* user, const Params& parameters)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
 
-			std::string srcrev = m->ModuleDLLManager->GetVersion();
-			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev.empty() ? "*" : srcrev, flags, V.description);
+			const char* srcrev = m->ModuleDLLManager->GetVersion();
+			user->WriteRemoteNumeric(RPL_MODLIST, m->ModuleSourceFile, srcrev ? "*" : srcrev, flags, V.description);
 		}
 		else
 		{
diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index a6f758d33..a3ba43ff2 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -26,62 +26,89 @@
 
 
 #include "inspircd.h"
-
 #ifndef _WIN32
-#include <dlfcn.h>
-#else
-#define dlopen(path, state) (void*)LoadLibraryA(path)
-#define dlsym(handle, export) (void*)GetProcAddress((HMODULE)handle, export)
-#define dlclose(handle) FreeLibrary((HMODULE)handle)
+# include <dlfcn.h>
 #endif
 
-DLLManager::DLLManager(const char *fname)
+/** The extension that dynamic libraries end with. */
+#define DLL_EXTENSION ".so"
+
+DLLManager::DLLManager(const std::string& name)
+	: lib(NULL)
+	, libname(name)
 {
-	if (!strstr(fname,".so"))
+	static size_t extlen = strlen(DLL_EXTENSION);
+	if (name.length() <= extlen || name.compare(name.length() - extlen, name.length(), DLL_EXTENSION))
 	{
-		err = "This doesn't look like a module file to me...";
-		h = NULL;
+		err.assign(name + " is not a module (no " DLL_EXTENSION " extension)");
 		return;
 	}
 
-	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
-	if (!h)
-	{
+#ifdef _WIN32
+	lib = LoadLibraryA(name.c_str());
+#else
+	lib = dlopen(name.c_str(), RTLD_NOW|RTLD_LOCAL);
+#endif
+
+	if (!lib)
 		RetrieveLastError();
-	}
 }
 
 DLLManager::~DLLManager()
 {
-	/* close the library */
-	if (h)
-		dlclose(h);
+	if (!lib)
+		return;
+
+#ifdef _WIN32
+	FreeLibrary(lib)
+#else
+	dlclose(lib);
+#endif
 }
 
 Module* DLLManager::CallInit()
 {
+	const uint32_t* abi = GetSymbol<const uint32_t>(MODULE_STR_ABI);
+	if (!abi)
+	{
+		err.assign(libname + " is not a module (no ABI symbol)");
+		return NULL;
+	}
+	else if (*abi != MODULE_ABI)
+	{
+		const char* version = GetVersion();
+		err.assign(InspIRCd::Format("%s was built against %s which is too %s to use with %s",
+			libname.c_str(), version ? version : "an unknown version",
+			*abi < MODULE_ABI ? "old" : "new", INSPIRCD_VERSION));
+		return NULL;
+	}
+
 	union
 	{
 		void* vptr;
 		Module* (*fptr)();
 	};
 
-	vptr = GetSymbol(MODULE_INIT_STR);
+	vptr = GetSymbol(MODULE_STR_INIT);
 	if (!vptr)
+	{
+		err.assign(libname + " is not a module (no init symbol)");
 		return NULL;
+	}
 
 	return (*fptr)();
 }
 
-void* DLLManager::GetSymbol(const char* name)
+void* DLLManager::GetSymbol(const char* name) const
 {
-	return h ? dlsym(h, name) : NULL;
-}
+	if (!lib)
+		return NULL;
 
-std::string DLLManager::GetVersion()
-{
-	const char* srcver = static_cast<const char*>(GetSymbol("inspircd_src_version"));
-	return srcver ? srcver : "";
+#if defined _WIN32
+	return GetProcAddress(lib, name);
+#else
+	return dlsym(lib, name);
+#endif
 }
 
 void DLLManager::RetrieveLastError()
diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index dea4b4575..e2d3f8dff 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -36,7 +36,6 @@
 #ifndef _WIN32
 	#include <unistd.h>
 	#include <sys/resource.h>
-	#include <dlfcn.h>
 	#include <getopt.h>
 	#include <pwd.h> // setuid
 	#include <grp.h> // setgid
diff --git a/src/logger.cpp b/src/logger.cpp
index a05edc55f..8aad5e8f1 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -56,7 +56,7 @@
  */
 
 const char LogStream::LogHeader[] =
-	"Log started for " INSPIRCD_VERSION " (" MODULE_INIT_STR ")";
+	"Log started for " INSPIRCD_VERSION;
 
 LogManager::LogManager()
 	: Logging(false)
diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp
index 218b9aa5a..e5309af57 100644
--- a/src/modulemanager.cpp
+++ b/src/modulemanager.cpp
@@ -69,13 +69,13 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
 			newmod->ModuleSourceFile = filename;
 			newmod->ModuleDLLManager = newhandle;
 			Modules[filename] = newmod;
-			std::string version = newhandle->GetVersion();
-			if (version.empty())
-				version.assign("unknown");
+			const char* version = newhandle->GetVersion();
+			if (!version)
+				version = "unknown";
 			if (defer)
 			{
 				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)",
-					filename.c_str(), version.c_str());
+					filename.c_str(), version);
 			}
 			else
 			{
@@ -88,7 +88,7 @@ bool ModuleManager::Load(const std::string& modname, bool defer)
 
 				Version v = newmod->GetVersion();
 				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)%s",
-					filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+					filename.c_str(), version, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
 			}
 		}
 		else