X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fdynamic.h;h=2aff7a29ff5a5dbdac02befd6add3c2af5a5ee28;hb=635cb9d65f6d7f6758ae8ed874da00c8d94b6e39;hp=d42cf61bf965855dbbb8231e374543f1b5b04ada;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/dynamic.h b/include/dynamic.h
index d42cf61bf..2aff7a29f 100644
--- a/include/dynamic.h
+++ b/include/dynamic.h
@@ -1,10 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007, 2009 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
- *   Copyright (C) 2003-2004, 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2013, 2019-2020 Sadie Powell <sadie@witchery.services>
+ *   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) 2007 Oliver Lupton <om@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 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
@@ -27,40 +30,59 @@
  */
 class CoreExport DLLManager : public classbase
 {
- protected:
-	/** The last error string
-	 */
+ private:
+	/** The last error string. */
 	std::string err;
 
+	/** The module library handle. */
 #ifdef _WIN32
-	/** Sets the last error string
-	*/
-	void RetrieveLastError();
+	HMODULE lib;
+#else
+	void* lib;
 #endif
 
+	/** The filename of the module library. */
+	const std::string libname;
+
+	/** Sets the last error string. */
+	void RetrieveLastError();
+
  public:
-	/** This constructor loads the module using dlopen()
-	 * @param fname The filename to load. This should be within
-	 * the modules dir.
+	/** Attempts to load the specified module.
+	 * @param name The name of the library to load.
 	 */
-	DLLManager(const char *fname);
-	virtual ~DLLManager();
+	DLLManager(const std::string& name);
+
+	/** Unloads the module if one was loaded. */
+	~DLLManager();
 
-	/** Get the last error from dlopen() or dlsym().
+	/** Attempts to create a new module instance from this shared library.
+	 * @return Either a new instance of the Module class or NULL on error.
 	 */
-	const std::string& LastError()
-	{
-		 return err;
-	}
+	Module* CallInit();
 
-	/** The module library handle.
+	/** Retrieves the value of the specified symbol.
+	 * @param name The name of the symbol to retrieve.
+	 * @return Either the value of the specified symbol or or NULL if it does not exist.
 	 */
-	void *h;
+	void* GetSymbol(const char* name) const;
 
-	/** Return a module by calling the init function
+	/** Retrieves the value of the specified symbol and casts it to the requested type.
+	 * @param name The name of the symbol to retrieve.
+	 * @return Either the value of the specified symbol or or NULL if it does not exist.
 	 */
-	Module* CallInit();
+	template <typename TReturn>
+	TReturn* GetSymbol(const char* name) const
+	{
+		return static_cast<TReturn*>(GetSymbol(name));
+	}
+
+	/** Retrieves the module version from the dynamic library. */
+	const char* GetVersion() const { return GetSymbol<const char>(MODULE_STR_VERSION); }
+
+	/** Retrieves the last error which occurred or an empty string if no errors have occurred. */
+	const std::string& LastError() const { return err; }
 
-	/** Get detailed version information from the module file */
-	std::string GetVersion();
+	/** Retrieves the filename of the underlying shared library. */
+	const std::string& LibraryName() const { return libname; }
 };