X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=98d7c87545b6a3229a81f051f8b1e24d1e0fc475;hb=3ccae741b8c60acc2d95f2dc54d7e69014090807;hp=ef0fe4472ffdda0378b9956fde9f83e24e8d66aa;hpb=8a7ed312cfcd47a39ac07b146b4aaf5f9ca1c0e2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index ef0fe4472..98d7c8754 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -37,7 +37,8 @@ TreeServer::TreeServer()
 	, Parent(NULL), Route(NULL)
 	, VersionString(ServerInstance->GetVersionString())
 	, fullversion(ServerInstance->GetVersionString(true))
-	, Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), ServerUser(ServerInstance->FakeClient)
+	, Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), isdead(false)
+	, ServerUser(ServerInstance->FakeClient)
 	, age(ServerInstance->Time()), Warned(false), UserCount(ServerInstance->Users.GetLocalUsers().size())
 	, OperCount(0), rtt(0), StartBurst(0), Hidden(false)
 {
@@ -50,7 +51,8 @@ TreeServer::TreeServer()
  */
 TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide)
 	: Server(Name, Desc)
-	, Parent(Above), Socket(Sock), sid(id), behind_bursting(Parent->behind_bursting), ServerUser(new FakeUser(id, this))
+	, Parent(Above), Socket(Sock), sid(id), behind_bursting(Parent->behind_bursting), isdead(false)
+	, ServerUser(new FakeUser(id, this))
 	, age(ServerInstance->Time()), Warned(false), UserCount(0), OperCount(0), rtt(0), StartBurst(0), Hidden(Hide)
 {
 	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "New server %s behind_bursting %u", GetName().c_str(), behind_bursting);
@@ -179,16 +181,13 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
 		ServerInstance->SNO->WriteToSnoMask('L', "Server \002" + server->GetName() + "\002 split from server \002" + GetName() + "\002 with reason: " + reason);
 	}
 
-	int num_lost_servers = 0;
-	int num_lost_users = 0;
-	const std::string quitreason = GetName() + " " + server->GetName();
+	unsigned int num_lost_servers = 0;
+	server->SQuitInternal(num_lost_servers);
 
-	ModuleSpanningTree* st = Utils->Creator;
-	st->SplitInProgress = true;
-	server->SQuitInternal(quitreason, num_lost_servers, num_lost_users);
-	st->SplitInProgress = false;
+	const std::string quitreason = GetName() + " " + server->GetName();
+	unsigned int num_lost_users = QuitUsers(quitreason);
 
-	ServerInstance->SNO->WriteToSnoMask(IsRoot() ? 'l' : 'L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.",
+	ServerInstance->SNO->WriteToSnoMask(IsRoot() ? 'l' : 'L', "Netsplit complete, lost \002%u\002 user%s on \002%u\002 server%s.",
 		num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
 
 	// No-op if the socket is already closed (i.e. it called us)
@@ -199,22 +198,23 @@ void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
 	ServerInstance->GlobalCulls.AddItem(server);
 }
 
-void TreeServer::SQuitInternal(const std::string& reason, int& num_lost_servers, int& num_lost_users)
+void TreeServer::SQuitInternal(unsigned int& num_lost_servers)
 {
 	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s lost in split", GetName().c_str());
 
 	for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i)
 	{
 		TreeServer* server = *i;
-		server->SQuitInternal(reason, num_lost_servers, num_lost_users);
+		server->SQuitInternal(num_lost_servers);
 	}
 
+	// Mark server as dead
+	isdead = true;
 	num_lost_servers++;
-	num_lost_users += QuitUsers(reason);
 	RemoveHash();
 }
 
-int TreeServer::QuitUsers(const std::string &reason)
+unsigned int TreeServer::QuitUsers(const std::string& reason)
 {
 	std::string publicreason = ServerInstance->Config->HideSplits ? "*.net *.split" : reason;
 
@@ -225,7 +225,8 @@ int TreeServer::QuitUsers(const std::string &reason)
 		User* user = i->second;
 		// Increment the iterator now because QuitUser() removes the user from the container
 		++i;
-		if (user->server == this)
+		TreeServer* server = TreeServer::Get(user);
+		if (server->IsDead())
 			ServerInstance->Users->QuitUser(user, publicreason, &reason);
 	}
 	return original_size - users.size();
@@ -321,32 +322,7 @@ void TreeServer::AddChild(TreeServer* Child)
 
 bool TreeServer::DelChild(TreeServer* Child)
 {
-	std::vector<TreeServer*>::iterator it = std::find(Children.begin(), Children.end(), Child);
-	if (it != Children.end())
-	{
-		Children.erase(it);
-		return true;
-	}
-	return false;
-}
-
-/** Removes child nodes of this node, and of that node, etc etc.
- * This is used during netsplits to automatically tidy up the
- * server tree. It is slow, we don't use it for much else.
- */
-void TreeServer::Tidy()
-{
-	while (1)
-	{
-		std::vector<TreeServer*>::iterator a = Children.begin();
-		if (a == Children.end())
-			return;
-		TreeServer* s = *a;
-		s->Tidy();
-		s->cull();
-		Children.erase(a);
-		delete s;
-	}
+	return stdalgo::erase(Children, Child);
 }
 
 CullResult TreeServer::cull()
@@ -376,6 +352,10 @@ TreeServer::~TreeServer()
 
 void TreeServer::RemoveHash()
 {
+	// XXX: Erase server from UserManager::uuidlist now, to allow sid reuse in the current main loop
+	// iteration, before the cull list is applied
+	ServerInstance->Users->uuidlist.erase(sid);
+
 	Utils->sidlist.erase(sid);
 	Utils->serverlist.erase(GetName());
 }