X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=f2acdd51c6c11736ca62f42bf8bc53a85b4b64b6;hb=4cc992f6c20354eef88b7652f268591daccb1b20;hp=e9cddcbbf91ac46020f2bb3b0bc561284315a983;hpb=73b9d0c5cb02f0ea8350de28bc3687e0af70ea0f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index e9cddcbbf..f2acdd51c 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,70 +1,100 @@
-#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"
 
+#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)
+#endif
 
-DLLManager::DLLManager( const char *fname )
+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)
+	{
+		RetrieveLastError();
+	}
 }
 
 DLLManager::~DLLManager()
 {
-	// close the library if it isn't null
-	if( h!=0 )
-    	dlclose(h);
+	/* close the library */
+	if (h)
+		dlclose(h);
 }
 
-
-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 )
+	union
 	{
-		*v = dlsym( h, sym_name );
-    	err=dlerror();
-	    if( err==0 )
-       	  return true;
-    	else
-    	  return false;
-	}
-	else
-	{	
-        return false;
-	}
-	
-}
+		void* vptr;
+		Module* (*fptr)();
+	};
 
+	vptr = GetSymbol(MODULE_INIT_STR);
+	if (!vptr)
+		return NULL;
 
-DLLFactoryBase::DLLFactoryBase(
-			       const char *fname,
-			       const char *factory=0
-			       ) : 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 (*fptr)();
 }
 
-
-DLLFactoryBase::~DLLFactoryBase()
+void* DLLManager::GetSymbol(const char* name)
 {
+	return h ? dlsym(h, name) : NULL;
 }
 
+std::string DLLManager::GetVersion()
+{
+	const char* srcver = static_cast<const char*>(GetSymbol("inspircd_src_version"));
+	return srcver ? srcver : "";
+}
 
+void DLLManager::RetrieveLastError()
+{
+#if defined _WIN32
+	char errmsg[500];
+	DWORD dwErrorCode = GetLastError();
+	if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0)
+		sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode);
+	SetLastError(ERROR_SUCCESS);
+	err = errmsg;
+#else
+	const char* errmsg = dlerror();
+	err = errmsg ? errmsg : "Unknown error";
+#endif
 
+	std::string::size_type p;
+	while ((p = err.find_last_of("\r\n")) != std::string::npos)
+		err.erase(p, 1);
+}