X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=8396866578e0aaa15a4d16e07b7b0cd89bf7baf9;hb=5ebb49de65a3f53730177665b5922dc3a62a94eb;hp=88d89a35bf424020a4daf93696bf84e48d57c42e;hpb=7affd6453d9d564636da5fe5c0fe7baba5fecf7a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules.cpp b/src/modules.cpp
index 88d89a35b..839686657 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -36,7 +36,7 @@
 	#include <dirent.h>
 #endif
 
-static std::vector<dynamic_reference_base*>* dynrefs = NULL;
+static intrusive_list<dynamic_reference_base>* dynrefs = NULL;
 static bool dynref_init_complete = false;
 
 void dynamic_reference_base::reset_all()
@@ -44,8 +44,8 @@ void dynamic_reference_base::reset_all()
 	dynref_init_complete = true;
 	if (!dynrefs)
 		return;
-	for(unsigned int i = 0; i < dynrefs->size(); i++)
-		(*dynrefs)[i]->resolve();
+	for (intrusive_list<dynamic_reference_base>::iterator i = dynrefs->begin(); i != dynrefs->end(); ++i)
+		(*i)->resolve();
 }
 
 // Version is a simple class for holding a modules version number
@@ -151,7 +151,7 @@ void		Module::OnBuildNeighborList(User*, IncludeChanList&, std::map<User*,bool>&
 void		Module::OnGarbageCollect() { DetachEvent(I_OnGarbageCollect); }
 ModResult	Module::OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { DetachEvent(I_OnSetConnectClass); return MOD_RES_PASSTHRU; }
 void 		Module::OnText(User*, void*, int, const std::string&, char, CUList&) { DetachEvent(I_OnText); }
-void		Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { DetachEvent(I_OnNamesListItem); }
+ModResult	Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { DetachEvent(I_OnNamesListItem); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnNumeric(User*, unsigned int, const std::string&) { DetachEvent(I_OnNumeric); return MOD_RES_PASSTHRU; }
 ModResult   Module::OnAcceptConnection(int, ListenSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { DetachEvent(I_OnAcceptConnection); return MOD_RES_PASSTHRU; }
 void		Module::OnSendWhoLine(User*, const std::vector<std::string>&, User*, Membership*, std::string&) { DetachEvent(I_OnSendWhoLine); }
@@ -390,7 +390,8 @@ void ModuleManager::DoSafeUnload(Module* mod)
 	std::vector<reference<ExtensionItem> > items;
 	ServerInstance->Extensions.BeginUnregister(modfind->second, items);
 	/* Give the module a chance to tidy out all its metadata */
-	for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); )
+	const chan_hash& chans = ServerInstance->GetChans();
+	for (chan_hash::const_iterator c = chans.begin(); c != chans.end(); )
 	{
 		Channel* chan = c->second;
 		++c;
@@ -400,7 +401,9 @@ void ModuleManager::DoSafeUnload(Module* mod)
 		for(UserMembCIter mi = users->begin(); mi != users->end(); mi++)
 			mi->second->doUnhookExtensions(items);
 	}
-	for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); )
+
+	const user_hash& users = ServerInstance->Users->GetUsers();
+	for (user_hash::const_iterator u = users.begin(); u != users.end(); )
 	{
 		User* user = u->second;
 		// The module may quit the user (e.g. SSL mod unloading) and that will remove it from the container
@@ -410,17 +413,19 @@ void ModuleManager::DoSafeUnload(Module* mod)
 	}
 
 	const ModeParser::ModeHandlerMap& usermodes = ServerInstance->Modes->GetModes(MODETYPE_USER);
-	for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); ++i)
+	for (ModeParser::ModeHandlerMap::const_iterator i = usermodes.begin(); i != usermodes.end(); )
 	{
 		ModeHandler* mh = i->second;
+		++i;
 		if (mh->creator == mod)
 			this->DelService(*mh);
 	}
 
 	const ModeParser::ModeHandlerMap& chanmodes = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL);
-	for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); ++i)
+	for (ModeParser::ModeHandlerMap::const_iterator i = chanmodes.begin(); i != chanmodes.end(); )
 	{
 		ModeHandler* mh = i->second;
+		++i;
 		if (mh->creator == mod)
 			this->DelService(*mh);
 	}
@@ -594,8 +599,7 @@ void ModuleManager::AddService(ServiceProvider& item)
 		case SERVICE_MODE:
 		{
 			ModeHandler* mh = static_cast<ModeHandler*>(&item);
-			if (!ServerInstance->Modes->AddMode(mh))
-				throw ModuleException("Mode "+std::string(item.name)+" already exists.");
+			ServerInstance->Modes->AddMode(mh);
 			DataProviders.insert(std::make_pair((mh->GetModeType() == MODETYPE_CHANNEL ? "mode/" : "umode/") + item.name, &item));
 			dynamic_reference_base::reset_all();
 			return;
@@ -672,29 +676,19 @@ dynamic_reference_base::dynamic_reference_base(Module* Creator, const std::strin
 	: name(Name), value(NULL), creator(Creator)
 {
 	if (!dynrefs)
-		dynrefs = new std::vector<dynamic_reference_base*>;
-	dynrefs->push_back(this);
+		dynrefs = new intrusive_list<dynamic_reference_base>;
+	dynrefs->push_front(this);
 	if (dynref_init_complete)
 		resolve();
 }
 
 dynamic_reference_base::~dynamic_reference_base()
 {
-	for(unsigned int i = 0; i < dynrefs->size(); i++)
+	dynrefs->erase(this);
+	if (dynrefs->empty())
 	{
-		if (dynrefs->at(i) == this)
-		{
-			unsigned int last = dynrefs->size() - 1;
-			if (i != last)
-				dynrefs->at(i) = dynrefs->at(last);
-			dynrefs->erase(dynrefs->begin() + last);
-			if (dynrefs->empty())
-			{
-				delete dynrefs;
-				dynrefs = NULL;
-			}
-			return;
-		}
+		delete dynrefs;
+		dynrefs = NULL;
 	}
 }