X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=5a2d4f8861b74757bdf990b163179beabb770e49;hb=001e9c1372a1c6fc2877f9d6607cf662f09228df;hp=3a7d8c4a9343607567a3b24c676a50780cc719ee;hpb=c1fa07d2eb6146a9e3f6c26f478a22b119032d27;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 3a7d8c4a9..5a2d4f886 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -37,7 +37,7 @@ TreeServer::TreeServer()
 	, Parent(NULL), Route(NULL)
 	, VersionString(ServerInstance->GetVersionString())
 	, fullversion(ServerInstance->GetVersionString(true))
-	, Socket(NULL), sid(ServerInstance->Config->GetSID()), ServerUser(ServerInstance->FakeClient)
+	, Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), ServerUser(ServerInstance->FakeClient)
 	, age(ServerInstance->Time()), Warned(false), UserCount(ServerInstance->Users.GetLocalUsers().size())
 	, OperCount(0), rtt(0), StartBurst(0), Hidden(false)
 {
@@ -50,9 +50,10 @@ 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), ServerUser(new FakeUser(id, this))
+	, Parent(Above), Socket(Sock), sid(id), behind_bursting(Parent->behind_bursting), 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);
 	CheckULine();
 	SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
 	SetPingFlag();
@@ -114,12 +115,14 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 
 void TreeServer::BeginBurst(unsigned long startms)
 {
+	behind_bursting++;
+
 	unsigned long now = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
 	// If the start time is in the future (clocks are not synced) then use current time
 	if ((!startms) || (startms > now))
 		startms = now;
 	this->StartBurst = startms;
-	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s started bursting at time %lu", sid.c_str(), startms);
+	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s started bursting at time %lu behind_bursting %u", sid.c_str(), startms, behind_bursting);
 }
 
 const std::string& TreeServer::GetID()
@@ -129,9 +132,17 @@ const std::string& TreeServer::GetID()
 
 void TreeServer::FinishBurstInternal()
 {
-	StartBurst = 0;
-	SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
-	SetPingFlag();
+	// Check is needed because 1202 protocol servers don't send the bursting state of a server, so servers
+	// introduced during a netburst may later send ENDBURST which would normally decrease this counter
+	if (behind_bursting > 0)
+		behind_bursting--;
+	ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "FinishBurstInternal() %s behind_bursting %u", GetName().c_str(), behind_bursting);
+
+	if (!IsBehindBursting())
+	{
+		SetNextPingTime(ServerInstance->Time() + Utils->PingFreq);
+		SetPingFlag();
+	}
 	for (ChildServers::const_iterator i = Children.begin(); i != Children.end(); ++i)
 	{
 		TreeServer* child = *i;
@@ -148,9 +159,63 @@ void TreeServer::FinishBurst()
 		GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
 	AddServerEvent(Utils->Creator, GetName());
 
+	StartBurst = 0;
 	FinishBurstInternal();
 }
 
+void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
+{
+	DelServerEvent(Utils->Creator, server->GetName());
+	DelChild(server);
+
+	if (IsRoot())
+	{
+		// Server split from us, generate a SQUIT message and broadcast it
+		ServerInstance->SNO->WriteGlobalSno('l', "Server \002" + server->GetName() + "\002 split: " + reason);
+		CmdBuilder("SQUIT").push(server->GetID()).push_last(reason).Broadcast();
+	}
+	else
+	{
+		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();
+
+	ModuleSpanningTree* st = Utils->Creator;
+	st->SplitInProgress = true;
+	server->SQuitInternal(quitreason, num_lost_servers, num_lost_users);
+	st->SplitInProgress = false;
+
+	ServerInstance->SNO->WriteToSnoMask(IsRoot() ? 'l' : 'L', "Netsplit complete, lost \002%d\002 user%s on \002%d\002 server%s.",
+		num_lost_users, num_lost_users != 1 ? "s" : "", num_lost_servers, num_lost_servers != 1 ? "s" : "");
+
+	server->Tidy();
+
+	// No-op if the socket is already closed (i.e. it called us)
+	if (server->IsLocal())
+		server->GetSocket()->Close();
+
+	server->cull();
+	delete server;
+}
+
+void TreeServer::SQuitInternal(const std::string& reason, int& num_lost_servers, int& num_lost_users)
+{
+	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);
+	}
+
+	num_lost_servers++;
+	num_lost_users += QuitUsers(reason);
+	RemoveHash();
+}
+
 int TreeServer::QuitUsers(const std::string &reason)
 {
 	std::string publicreason = ServerInstance->Config->HideSplits ? "*.net *.split" : reason;
@@ -298,7 +363,10 @@ TreeServer::~TreeServer()
 	/* We'd better tidy up after ourselves, eh? */
 	if (!IsRoot())
 		delete ServerUser;
+}
 
+void TreeServer::RemoveHash()
+{
 	Utils->sidlist.erase(sid);
 	Utils->serverlist.erase(GetName());
 }