X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=d77221c39f847b975f7c0af38c1c47ee635d3782;hb=81215de4f00d0044f1dbe0d1c81d1b7081e5405d;hp=a7acb24d08b3ca90c3ae8aab3ffd73633daf1cd0;hpb=8f34594cb7d600ccff100dff1817b69b03756ea2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index a7acb24d0..d77221c39 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -337,12 +337,6 @@ bool ModuleManager::CanUnload(Module* mod)
 		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
 		return false;
 	}
-	if (mod->GetVersion().Flags & VF_STATIC)
-	{
-		LastModuleError = "Module " + mod->ModuleSourceFile + " not unloadable (marked static)";
-		ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
-		return false;
-	}
 
 	mod->dying = true;
 	return true;
@@ -457,26 +451,6 @@ namespace
 			ServerInstance->GlobalCulls.AddItem(this);
 		}
 	};
-
-	struct ReloadAction : public HandlerBase0<void>
-	{
-		Module* const mod;
-		HandlerBase1<void, bool>* const callback;
-		ReloadAction(Module* m, HandlerBase1<void, bool>* c)
-			: mod(m), callback(c) {}
-		void Call()
-		{
-			DLLManager* dll = mod->ModuleDLLManager;
-			std::string name = mod->ModuleSourceFile;
-			ServerInstance->Modules->DoSafeUnload(mod);
-			ServerInstance->GlobalCulls.Apply();
-			delete dll;
-			bool rv = ServerInstance->Modules->Load(name);
-			if (callback)
-				callback->Call(rv);
-			ServerInstance->GlobalCulls.AddItem(this);
-		}
-	};
 }
 
 bool ModuleManager::Unload(Module* mod)
@@ -487,14 +461,6 @@ bool ModuleManager::Unload(Module* mod)
 	return true;
 }
 
-void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
-{
-	if (CanUnload(mod))
-		ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-	else if (callback)
-		callback->Call(false);
-}
-
 void ModuleManager::LoadAll()
 {
 	std::map<std::string, ServiceList> servicemap;
@@ -505,7 +471,7 @@ void ModuleManager::LoadAll()
 	{
 		ConfigTag* tag = i->second;
 		std::string name = tag->getString("name");
-		this->NewServices = &servicemap[name];
+		this->NewServices = &servicemap[ExpandModName(name)];
 		std::cout << "[" << con_green << "*" << con_reset << "] Loading module:\t" << con_green << name << con_reset << std::endl;
 
 		if (!this->Load(name, true))
@@ -562,22 +528,6 @@ void ModuleManager::AddService(ServiceProvider& item)
 {
 	switch (item.service)
 	{
-		case SERVICE_COMMAND:
-			if (!ServerInstance->Parser.AddCommand(static_cast<Command*>(&item)))
-				throw ModuleException("Command "+std::string(item.name)+" already exists.");
-			return;
-		case SERVICE_MODE:
-		{
-			ModeHandler* mh = static_cast<ModeHandler*>(&item);
-			ServerInstance->Modes->AddMode(mh);
-			DataProviders.insert(std::make_pair((mh->GetModeType() == MODETYPE_CHANNEL ? "mode/" : "umode/") + item.name, &item));
-			dynamic_reference_base::reset_all();
-			return;
-		}
-		case SERVICE_METADATA:
-			if (!ServerInstance->Extensions.Register(static_cast<ExtensionItem*>(&item)))
-				throw ModuleException("Extension " + std::string(item.name) + " already exists.");
-			return;
 		case SERVICE_DATA:
 		case SERVICE_IOHOOK:
 		{
@@ -595,7 +545,7 @@ void ModuleManager::AddService(ServiceProvider& item)
 			return;
 		}
 		default:
-			throw ModuleException("Cannot add unknown service type");
+			item.RegisterService();
 	}
 }
 
@@ -610,13 +560,7 @@ void ModuleManager::DelService(ServiceProvider& item)
 		case SERVICE_DATA:
 		case SERVICE_IOHOOK:
 		{
-			for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
-			{
-				std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
-				if (curr->second == &item)
-					DataProviders.erase(curr);
-			}
-			dynamic_reference_base::reset_all();
+			DelReferent(&item);
 			return;
 		}
 		default:
@@ -642,6 +586,16 @@ ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string&
 	}
 }
 
+std::string ModuleManager::ExpandModName(const std::string& modname)
+{
+	// Transform "callerid" -> "m_callerid.so" unless it already has a ".so" extension,
+	// so coremods in the "core_*.so" form aren't changed
+	std::string ret = modname;
+	if ((modname.length() < 3) || (modname.compare(modname.size() - 3, 3, ".so")))
+		ret.insert(0, "m_").append(".so");
+	return ret;
+}
+
 dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::string& Name)
 	: name(Name), hook(NULL), value(NULL), creator(Creator)
 {
@@ -691,10 +645,29 @@ void dynamic_reference_base::resolve()
 
 Module* ModuleManager::Find(const std::string &name)
 {
-	std::map<std::string, Module*>::iterator modfind = Modules.find(name);
+	std::map<std::string, Module*>::const_iterator modfind = Modules.find(ExpandModName(name));
 
 	if (modfind == Modules.end())
 		return NULL;
 	else
 		return modfind->second;
 }
+
+void ModuleManager::AddReferent(const std::string& name, ServiceProvider* service)
+{
+	DataProviders.insert(std::make_pair(name, service));
+	dynamic_reference_base::reset_all();
+}
+
+void ModuleManager::DelReferent(ServiceProvider* service)
+{
+	for (std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
+	{
+		ServiceProvider* curr = i->second;
+		if (curr == service)
+			DataProviders.erase(i++);
+		else
+			++i;
+	}
+	dynamic_reference_base::reset_all();
+}