X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreeserver.cpp;h=ca7959ea7d44dacb8787e9641a00a5ece1ae0767;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=0750e755cfc8f889a8d0c2b06a5c2788236ab29a;hpb=0982b2a58259ec1653e2af93ec612ec98378a087;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 0750e755c..ca7959ea7 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -23,7 +23,7 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "main.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 #include "utils.h"
 #include "treeserver.h"
@@ -37,6 +37,7 @@ TreeServer::TreeServer()
 	, Parent(NULL), Route(NULL)
 	, VersionString(ServerInstance->GetVersionString())
 	, fullversion(ServerInstance->GetVersionString(true))
+	, rawversion(INSPIRCD_VERSION)
 	, Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), isdead(false)
 	, pingtimer(this)
 	, ServerUser(ServerInstance->FakeClient)
@@ -115,6 +116,8 @@ TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const s
 
 	this->AddHashEntry();
 	Parent->Children.push_back(this);
+
+	FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnServerLink, (this));
 }
 
 void TreeServer::BeginBurst(uint64_t startms)
@@ -151,7 +154,6 @@ void TreeServer::FinishBurst()
 	unsigned long bursttime = ts - this->StartBurst;
 	ServerInstance->SNO->WriteToSnoMask(Parent == Utils->TreeRoot ? 'l' : 'L', "Received end of netburst from \2%s\2 (burst time: %lu %s)",
 		GetName().c_str(), (bursttime > 10000 ? bursttime / 1000 : bursttime), (bursttime > 10000 ? "secs" : "msecs"));
-	FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerLink, (this));
 
 	StartBurst = 0;
 	FinishBurstInternal();
@@ -159,7 +161,6 @@ void TreeServer::FinishBurst()
 
 void TreeServer::SQuitChild(TreeServer* server, const std::string& reason)
 {
-	FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), SpanningTreeEventListener, OnServerSplit, (server));
 	stdalgo::erase(Children, server);
 
 	if (IsRoot())
@@ -204,6 +205,9 @@ void TreeServer::SQuitInternal(unsigned int& num_lost_servers)
 	isdead = true;
 	num_lost_servers++;
 	RemoveHash();
+
+	if (!Utils->Creator->dying)
+		FOREACH_MOD_CUSTOM(Utils->Creator->GetEventProvider(), ServerEventListener, OnServerSplit, (this));
 }
 
 unsigned int TreeServer::QuitUsers(const std::string& reason)
@@ -285,10 +289,6 @@ 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());
 }