X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdynamic.cpp;h=27662a3516bccbc704fec1655e83a6692c7e611b;hb=97e8518c1961c3d1ff7b3a0ad4e04ee2880c1fc4;hp=80035ef70575f95faa491fb32c97db66f82d8f80;hpb=4bbca0643b56f26f73a05462d226b2dd8871626b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 80035ef70..27662a351 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,37 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   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>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "dynamic.h"
 #ifndef WIN32
 #include <dlfcn.h>
 #endif
 
-DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
+DLLManager::DLLManager(const char *fname)
 {
-	err = NULL;
-
 	if (!strstr(fname,".so"))
 	{
 		err = "This doesn't look like a module file to me...";
+		h = NULL;
 		return;
 	}
 
 	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
 	if (!h)
 	{
-		err = (char*)dlerror();
-		return;
+		err = dlerror();
 	}
 }
 
@@ -42,43 +50,34 @@ DLLManager::~DLLManager()
 		dlclose(h);
 }
 
+union init_t {
+	void* vptr;
+	Module* (*fptr)();
+};
 
-
-bool DLLManager::GetSymbol(void** v, const char* sym_name)
+Module* DLLManager::CallInit()
 {
-	/*
-	 * try extract a symbol from the library
-	 * get any error message is there is any
-	 */
-	
-	if (h)
-	{
-		dlerror(); // clear value
-		*v = dlsym(h, sym_name);
-		err = (char*)dlerror();
-		if (!*v || err)
-			return false;
-	}
-	
-	/* succeeded :) */
-	return true;
-}
+	if (!h)
+		return NULL;
 
-DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
-{
-	/* try get the factory function if there is no error yet */
-	factory_func = 0;
-	
-	if (!LastError())
+	init_t initfn;
+	initfn.vptr = dlsym(h, MODULE_INIT_STR);
+	if (!initfn.vptr)
 	{
-		if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
-		{
-			throw ModuleException("Missing init_module() entrypoint!");
-		}
+		err = dlerror();
+		return NULL;
 	}
+
+	return (*initfn.fptr)();
 }
 
-DLLFactoryBase::~DLLFactoryBase()
+std::string DLLManager::GetVersion()
 {
-}
+	if (!h)
+		return "";
 
+	const char* srcver = (char*)dlsym(h, "inspircd_src_version");
+	if (srcver)
+		return srcver;
+	return "Unversioned module";
+}