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 d0c6401cd4fc6c0667f03fc69622e226fb1f0e89..b29bea1346f0d9e0c594135c83e3e46f37962d69 100644 (file)
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -40,7 +40,7 @@ TreeServer::TreeServer()
        , Socket(NULL), sid(ServerInstance->Config->GetSID()), behind_bursting(0), isdead(false)
        , pingtimer(this)
        , ServerUser(ServerInstance->FakeClient)
-       , age(ServerInstance->Time()), UserCount(ServerInstance->Users.GetLocalUsers().size())
+       , age(ServerInstance->Time()), UserCount(ServerInstance->Users.LocalUserCount())
        , OperCount(0), rtt(0), StartBurst(0), Hidden(false)
 {
        AddHashEntry();
@@ -48,7 +48,7 @@ TreeServer::TreeServer()
 
 /** When we create a new server, we call this constructor to initialize it.
  * This constructor initializes the server's Route and Parent, and sets up
- * its ping counters so that it will be pinged one minute from now.
+ * the ping timer for the server.
  */
 TreeServer::TreeServer(const std::string& Name, const std::string& Desc, const std::string& id, TreeServer* Above, TreeSocket* Sock, bool Hide)
        : Server(Name, Desc)
@@ -115,18 +115,20 @@ 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(unsigned long startms)
+void TreeServer::BeginBurst(uint64_t startms)
 {
        behind_bursting++;
 
-       unsigned long now = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
+       uint64_t 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 behind_bursting %u", sid.c_str(), startms, behind_bursting);
+       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Server %s started bursting at time %s behind_bursting %u", sid.c_str(), ConvToStr(startms).c_str(), behind_bursting);
 }
 
 void TreeServer::FinishBurstInternal()
@@ -147,11 +149,10 @@ void TreeServer::FinishBurstInternal()
 void TreeServer::FinishBurst()
 {
        ServerInstance->XLines->ApplyLines();
-       long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
+       uint64_t ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
        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)
@@ -248,8 +251,8 @@ void TreeServer::CheckULine()
        }
 }
 
-/** This method is used to add the structure to the
- * hash_map for linear searches. It is only called
+/** This method is used to add the server to the
+ * maps for linear searches. It is only called
  * by the constructors.
  */
 void TreeServer::AddHashEntry()
@@ -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());
 }