X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=27662a3516bccbc704fec1655e83a6692c7e611b;hb=428a5e3d0f5060d43c56a8a8595c8102241ce7ea;hp=90c7d20f02937bcf644a219d87d743ba6bf35a33;hpb=b5f16515b7d435c90cd2e182e3dcd63a57de488a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 90c7d20f0..27662a351 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,64 +1,83 @@
-#include "globals.h"
-#include <dlfcn.h>
-#include "dynamic.h"
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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 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(const char *fname)
 {
-    // Try to open the library now and get any error message.
-	
-	h=dlopen( fname, RTLD_NOW );
-	err=dlerror();
+	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 = dlerror();
+	}
 }
 
 DLLManager::~DLLManager()
 {
-	// close the library if it isn't null
-	if (h!=0)
-    	dlclose(h);
+	/* close the library */
+	if (h)
+		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!=0 )
+	if (!h)
+		return NULL;
+
+	init_t initfn;
+	initfn.vptr = dlsym(h, MODULE_INIT_STR);
+	if (!initfn.vptr)
 	{
-		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
+		err = dlerror();
+		return NULL;
 	}
-	else
-	{	
-        return false;
-	}
-	
-}
-
 
-DLLFactoryBase::DLLFactoryBase(const char *fname, const char *factory) : DLLManager(fname)
-{
-	// try get the factory function if there is no error yet
-	
-	factory_func=0;
-	
-	if( LastError()==0 )
-	{		
-    	GetSymbol( (void **)&factory_func, factory ? factory : "init_module" );
-	}
-	
+	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";
+}