X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fserver.cpp;h=ecdad87f81797babf9e59337412a86786d97c71c;hb=93fa544b2671b078cf81ac04fbb4b48d5e2d1677;hp=e7868090dea8c3ea4f9f26b278c417aaa85ab7ef;hpb=6c37b451cd2bb948d562cb00354bdc7a7dc400da;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index e7868090d..ecdad87f8 100644
--- 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"
@@ -63,7 +64,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 +82,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(ConvToNum<uint64_t>(val));
 	}
 }
 
@@ -95,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];
@@ -112,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))
@@ -125,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;
 	}
 
@@ -160,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)
 	{
@@ -170,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);
 
@@ -217,5 +228,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());
 }