m_spanningtree Call the OnServerLink hook from TreeServer constructor

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / treeserver.cpp

diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 0750e755cfc8f889a8d0c2b06a5c2788236ab29a..b29bea1346f0d9e0c594135c83e3e46f37962d69 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -115,6 +115,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(), SpanningTreeEventListener, OnServerLink, (this));
 }
 
 void TreeServer::BeginBurst(uint64_t startms)
@@ -151,7 +153,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 +160,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 +204,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(), SpanningTreeEventListener, OnServerSplit, (this));
 }
 
 unsigned int TreeServer::QuitUsers(const std::string& reason)
@@ -285,10 +288,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());
 }