X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=5f69820c9ec84805a1bae24f9f7009c193bc392f;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=25178cfa111c7f287461e9fd4053e7f70e22cb0a;hpb=9375c633371ee8d25adc5cf756590077e5100bb5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 25178cfa1..5f69820c9 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,11 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2003, 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2003, 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -22,68 +27,92 @@
 
 
 #include "inspircd.h"
-#include "dynamic.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;
 
-union init_t {
-	void* vptr;
-	Module* (*fptr)();
-};
+#ifdef _WIN32
+	FreeLibrary(lib);
+#else
+	dlclose(lib);
+#endif
+}
 
 Module* DLLManager::CallInit()
 {
-	if (!h)
+	if (!lib)
 		return NULL;
 
-	init_t initfn;
-	initfn.vptr = dlsym(h, MODULE_INIT_STR);
-	if (!initfn.vptr)
+	const unsigned long* abi = GetSymbol<const unsigned long>(MODULE_STR_ABI);
+	if (!abi)
 	{
-		RetrieveLastError();
+		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 (%lu) which is too %s to use with %s (%lu).",
+			libname.c_str(), version ? version : "an unknown version", *abi,
+			*abi < MODULE_ABI ? "old" : "new", INSPIRCD_VERSION, MODULE_ABI));
 		return NULL;
 	}
 
-	return (*initfn.fptr)();
+	union
+	{
+		void* vptr;
+		Module* (*fptr)();
+	};
+
+	vptr = GetSymbol(MODULE_STR_INIT);
+	if (!vptr)
+	{
+		err.assign(libname + " is not a module (no init symbol)");
+		return NULL;
+	}
+
+	return (*fptr)();
 }
 
-std::string DLLManager::GetVersion()
+void* DLLManager::GetSymbol(const char* name) const
 {
-	if (!h)
-		return "";
+	if (!lib)
+		return NULL;
 
-	const char* srcver = (char*)dlsym(h, "inspircd_src_version");
-	if (srcver)
-		return srcver;
-	return "Unversioned module";
+#if defined _WIN32
+	return GetProcAddress(lib, name);
+#else
+	return dlsym(lib, name);
+#endif
 }
 
 void DLLManager::RetrieveLastError()
@@ -96,7 +125,7 @@ void DLLManager::RetrieveLastError()
 	SetLastError(ERROR_SUCCESS);
 	err = errmsg;
 #else
-	char* errmsg = dlerror();
+	const char* errmsg = dlerror();
 	err = errmsg ? errmsg : "Unknown error";
 #endif