X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodmanager_dynamic.cpp;h=750a1c448002c8cc17b416cdf7618b8e8160ab22;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=adff8630d523e2b4b285db5f40be5c70a82955b6;hpb=645f7e18c64a6628ede880dc69bf8825ba93b375;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index adff8630d..750a1c448 100644
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -22,7 +22,6 @@
 #include "socket.h"
 #include "socketengine.h"
 #include "command_parse.h"
-#include "dns.h"
 #include "exitcodes.h"
 #include <iostream>
 
@@ -38,10 +37,9 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 	if (filename.find('/') != std::string::npos)
 		return false;
 
-	char modfile[MAXBUF];
-	snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename.c_str());
+	const std::string moduleFile = ServerInstance->Config->Paths.PrependModule(filename);
 
-	if (!ServerConfig::FileExists(modfile))
+	if (!ServerConfig::FileExists(moduleFile.c_str()))
 	{
 		LastModuleError = "Module file could not be found: " + filename;
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
@@ -56,7 +54,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 	}
 
 	Module* newmod = NULL;
-	DLLManager* newhandle = new DLLManager(modfile);
+	DLLManager* newhandle = new DLLManager(moduleFile.c_str());
 
 	try
 	{
@@ -66,19 +64,21 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 		{
 			newmod->ModuleSourceFile = filename;
 			newmod->ModuleDLLManager = newhandle;
+			newmod->dying = false;
 			Modules[filename] = newmod;
 			std::string version = newhandle->GetVersion();
 			if (defer)
 			{
-				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT,"New module introduced: %s (Module version %s)",
+				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)",
 					filename.c_str(), version.c_str());
 			}
 			else
 			{
+				AttachAll(newmod);
 				newmod->init();
 
 				Version v = newmod->GetVersion();
-				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT,"New module introduced: %s (Module version %s)%s",
+				ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)%s",
 					filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
 			}
 		}
@@ -109,7 +109,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
 	if (defer)
 		return true;
 
-	FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod));
+	FOREACH_MOD(OnLoadModule, (newmod));
 	/* We give every module a chance to re-prioritize when we introduce a new one,
 	 * not just the one thats loading, as the new module could affect the preference
 	 * of others
@@ -190,7 +190,7 @@ void ModuleManager::LoadAll()
 	std::cout << std::endl << "Loading core commands";
 	fflush(stdout);
 
-	DIR* library = opendir(ServerInstance->Config->ModPath.c_str());
+	DIR* library = opendir(ServerInstance->Config->Paths.Module.c_str());
 	if (library)
 	{
 		dirent* entry = NULL;
@@ -234,6 +234,7 @@ void ModuleManager::LoadAll()
 		try
 		{
 			ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Initializing %s", i->first.c_str());
+			AttachAll(mod);
 			mod->init();
 		}
 		catch (CoreException& modexcept)