Remove trailing whitespace from various source files.

[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 3835695dde3c6c8dfac8c711a955d442c2707a2f..65e0a2c4d914cec87cfa9228b541d6a3349f419c 100644 (file)
--- 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,18 +116,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(), ServerEventListener, 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 +150,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 +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,11 +205,14 @@ 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)
 {
-       std::string publicreason = ServerInstance->Config->HideSplits ? "*.net *.split" : reason;
+       std::string publicreason = Utils->HideSplits ? "*.net *.split" : reason;
 
        const user_hash& users = ServerInstance->Users->GetUsers();
        unsigned int original_size = users.size();
@@ -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());
 }