Make User::WriteRemoteNumeric() virtual, implement it in SpanningTree::RemoteUser

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

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index e7868090dea8c3ea4f9f26b278c417aaa85ab7ef..bc43841c1cafefd4a9950605b9b91548413505f0 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -63,7 +63,6 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std:
 
        TreeServer* Node = new TreeServer(servername, description, sid, ParentOfThis, ParentOfThis->GetSocket(), lnk ? lnk->Hidden : false);
 
-       Node->BeginBurst();
        HandleExtra(Node, params);
 
        ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")");
@@ -82,8 +81,11 @@ void CommandServer::HandleExtra(TreeServer* newserver, const std::vector<std::st
                if (p != std::string::npos)
                {
                        key.erase(p);
-                       val = prop.substr(p+1);
+                       val.assign(prop, p+1, std::string::npos);
                }
+
+               if (key == "burst")
+                       newserver->BeginBurst(ConvToUInt64(val));
        }
 }
 
@@ -160,7 +162,7 @@ bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
 
 bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid)
 {
-       /* Check for fully initialized instances of the server by name */
+       // Check if the server name is not in use by a server that's already fully connected
        TreeServer* CheckDupe = Utils->FindServer(sname);
        if (CheckDupe)
        {
@@ -170,7 +172,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
                return false;
        }
 
-       /* Check for fully initialized instances of the server by id */
+       // Check if the id is not in use by a server that's already fully connected
        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Looking for dupe SID %s", sid.c_str());
        CheckDupe = Utils->FindServerID(sid);
 
@@ -217,5 +219,7 @@ CommandServer::Builder::Builder(TreeServer* server)
 {
        push(server->GetName());
        push(server->GetID());
+       if (server->IsBursting())
+               push_property("burst", ConvToStr(server->StartBurst));
        push_last(server->GetDesc());
 }