Optimize some behaviour in the core (#1476).

[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 017b9ddb3fb44e66ab1506f2ff50ab315dbe9b1c..ecdad87f81797babf9e59337412a86786d97c71c 100644 (file)
--- a/src/modules/m_spanningtree/server.cpp
+++ b/src/modules/m_spanningtree/server.cpp
@@ -19,6 +19,7 @@
 
 
 #include "inspircd.h"
+#include "modules/ssl.h"
 
 #include "main.h"
 #include "utils.h"
@@ -34,9 +35,7 @@
 CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std::string>& params)
 {
        const std::string& servername = params[0];
-       // password is not used for a remote server
-       // hopcount is not used (ever)
-       const std::string& sid = params[3];
+       const std::string& sid = params[1];
        const std::string& description = params.back();
        TreeSocket* socket = ParentOfThis->GetSocket();
 
@@ -65,11 +64,32 @@ CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std:
 
        TreeServer* Node = new TreeServer(servername, description, sid, ParentOfThis, ParentOfThis->GetSocket(), lnk ? lnk->Hidden : false);
 
-       ParentOfThis->AddChild(Node);
+       HandleExtra(Node, params);
+
        ServerInstance->SNO->WriteToSnoMask('L', "Server \002"+ParentOfThis->GetName()+"\002 introduced server \002"+servername+"\002 ("+description+")");
        return CMD_SUCCESS;
 }
 
+void CommandServer::HandleExtra(TreeServer* newserver, const std::vector<std::string>& params)
+{
+       for (std::vector<std::string>::const_iterator i = params.begin() + 2; i != params.end() - 1; ++i)
+       {
+               const std::string& prop = *i;
+               std::string::size_type p = prop.find('=');
+
+               std::string key = prop;
+               std::string val;
+               if (p != std::string::npos)
+               {
+                       key.erase(p);
+                       val.assign(prop, p+1, std::string::npos);
+               }
+
+               if (key == "burst")
+                       newserver->BeginBurst(ConvToNum<uint64_t>(val));
+       }
+}
+
 Link* TreeSocket::AuthRemote(const parameterlist& params)
 {
        if (params.size() < 5)
@@ -78,7 +98,6 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
                return NULL;
        }
 
-       irc::string servername = params[0].c_str();
        const std::string& sname = params[0];
        const std::string& password = params[1];
        const std::string& sid = params[3];
@@ -95,7 +114,7 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
        for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i < Utils->LinkBlocks.end(); i++)
        {
                Link* x = *i;
-               if (x->Name != servername && x->Name != "*") // open link allowance
+               if ((!stdalgo::string::equalsci(x->Name, sname)) && (x->Name != "*")) // open link allowance
                        continue;
 
                if (!ComparePass(*x, password))
@@ -108,6 +127,15 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
                        return NULL;
 
                ServerInstance->SNO->WriteToSnoMask('l',"Verified server connection " + linkID + " ("+description+")");
+
+               const SSLIOHook* const ssliohook = SSLIOHook::IsSSL(this);
+               if (ssliohook)
+               {
+                       std::string ciphersuite;
+                       ssliohook->GetCiphersuite(ciphersuite);
+                       ServerInstance->SNO->WriteToSnoMask('l', "Negotiated ciphersuite %s on link %s", ciphersuite.c_str(), x->Name.c_str());
+               }
+
                return x;
        }
 
@@ -143,7 +171,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)
        {
@@ -153,7 +181,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);
 
@@ -199,7 +227,8 @@ CommandServer::Builder::Builder(TreeServer* server)
        : CmdBuilder(server->GetParent()->GetID(), "SERVER")
 {
        push(server->GetName());
-       push_raw(" * 0 ");
-       push_raw(server->GetID());
+       push(server->GetID());
+       if (server->IsBursting())
+               push_property("burst", ConvToStr(server->StartBurst));
        push_last(server->GetDesc());
 }