X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=f204f3fc1b1ae2a576e9c1afc8415fc0a23a6971;hb=978084d96ff6ad38f155c9befd61c7c43677d763;hp=6d0d3bf9406a94e0b3917e5a171abbb958ff76a9;hpb=3b927b48ccb30619d9ace318b5a7d21f2279abbf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 6d0d3bf94..f204f3fc1 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -116,9 +116,6 @@ void		Module::OnPostConnect(User*) { DetachEvent(I_OnPostConnect); }
 void		Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&, MessageType) { DetachEvent(I_OnUserMessage); }
 void		Module::OnUserInvite(User*, User*, Channel*, time_t, unsigned int, CUList&) { DetachEvent(I_OnUserInvite); }
 void		Module::OnPostTopicChange(User*, Channel*, const std::string&) { DetachEvent(I_OnPostTopicChange); }
-void		Module::OnSyncUser(User*, ProtocolInterface::Server&) { DetachEvent(I_OnSyncUser); }
-void		Module::OnSyncChannel(Channel*, ProtocolInterface::Server&) { DetachEvent(I_OnSyncChannel); }
-void		Module::OnSyncNetwork(ProtocolInterface::Server&) { DetachEvent(I_OnSyncNetwork); }
 void		Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { DetachEvent(I_OnDecodeMetaData); }
 void		Module::OnChangeHost(User*, const std::string&) { DetachEvent(I_OnChangeHost); }
 void		Module::OnChangeName(User*, const std::string&) { DetachEvent(I_OnChangeName); }
@@ -126,7 +123,7 @@ void		Module::OnChangeIdent(User*, const std::string&) { DetachEvent(I_OnChangeI
 void		Module::OnAddLine(User*, XLine*) { DetachEvent(I_OnAddLine); }
 void		Module::OnDelLine(User*, XLine*) { DetachEvent(I_OnDelLine); }
 void		Module::OnExpireLine(XLine*) { DetachEvent(I_OnExpireLine); }
-void 		Module::OnCleanup(int, void*) { }
+void 		Module::OnCleanup(ExtensionItem::ExtensibleType, Extensible*) { }
 ModResult	Module::OnChannelPreDelete(Channel*) { DetachEvent(I_OnChannelPreDelete); return MOD_RES_PASSTHRU; }
 void		Module::OnChannelDelete(Channel*) { DetachEvent(I_OnChannelDelete); }
 ModResult	Module::OnSetAway(User*, const std::string &) { DetachEvent(I_OnSetAway); return MOD_RES_PASSTHRU; }
@@ -139,6 +136,8 @@ ModResult	Module::OnNumeric(User*, const Numeric::Numeric&) { DetachEvent(I_OnNu
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, Numeric::Numeric&) { DetachEvent(I_OnSendWhoLine); return MOD_RES_PASSTHRU; }
 void		Module::OnSetUserIP(LocalUser*) { DetachEvent(I_OnSetUserIP); }
+void		Module::OnServiceAdd(ServiceProvider&) { DetachEvent(I_OnServiceAdd); }
+void		Module::OnServiceDel(ServiceProvider&) { DetachEvent(I_OnServiceDel); }
 
 #ifdef INSPIRCD_ENABLE_TESTSUITE
 void		Module::OnRunTestSuite() { }
@@ -375,11 +374,14 @@ void ModuleManager::DoSafeUnload(Module* mod)
 	{
 		Channel* chan = c->second;
 		++c;
-		mod->OnCleanup(TYPE_CHANNEL, chan);
+		mod->OnCleanup(ExtensionItem::EXT_CHANNEL, chan);
 		chan->doUnhookExtensions(items);
 		const Channel::MemberMap& users = chan->GetUsers();
 		for (Channel::MemberMap::const_iterator mi = users.begin(); mi != users.end(); ++mi)
+		{
+			mod->OnCleanup(ExtensionItem::EXT_MEMBERSHIP, mi->second);
 			mi->second->doUnhookExtensions(items);
+		}
 	}
 
 	const user_hash& users = ServerInstance->Users->GetUsers();
@@ -388,7 +390,7 @@ void ModuleManager::DoSafeUnload(Module* mod)
 		User* user = u->second;
 		// The module may quit the user (e.g. SSL mod unloading) and that will remove it from the container
 		++u;
-		mod->OnCleanup(TYPE_USER, user);
+		mod->OnCleanup(ExtensionItem::EXT_USER, user);
 		user->doUnhookExtensions(items);
 	}
 
@@ -435,11 +437,11 @@ void ModuleManager::UnloadAll()
 
 namespace
 {
-	struct UnloadAction : public HandlerBase0<void>
+	struct UnloadAction : public ActionBase
 	{
 		Module* const mod;
 		UnloadAction(Module* m) : mod(m) {}
-		void Call()
+		void Call() CXX11_OVERRIDE
 		{
 			DLLManager* dll = mod->ModuleDLLManager;
 			ServerInstance->Modules->DoSafeUnload(mod);
@@ -544,11 +546,13 @@ void ModuleManager::AddService(ServiceProvider& item)
 				DataProviders.insert(std::make_pair(item.name.substr(slash + 1), &item));
 			}
 			dynamic_reference_base::reset_all();
-			return;
+			break;
 		}
 		default:
 			item.RegisterService();
 	}
+
+	FOREACH_MOD(OnServiceAdd, (item));
 }
 
 void ModuleManager::DelService(ServiceProvider& item)
@@ -568,6 +572,8 @@ void ModuleManager::DelService(ServiceProvider& item)
 		default:
 			throw ModuleException("Cannot delete unknown service type");
 	}
+
+	FOREACH_MOD(OnServiceDel, (item));
 }
 
 ServiceProvider* ModuleManager::FindService(ServiceType type, const std::string& name)