X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fserver.cpp;h=07004a1e8069468cc8031470d56080eb2ddc72a9;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=5da000f2039e181850a91d289724091d51c17f37;hpb=984004505b8b5eea2467b703411fccac831ee780;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/server.cpp b/src/modules/m_spanningtree/server.cpp
index 5da000f20..07004a1e8 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"
@@ -31,7 +32,7 @@
  * Some server somewhere in the network introducing another server.
  *	-- w
  */
-CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, std::vector<std::string>& params)
+CmdResult CommandServer::HandleServer(TreeServer* ParentOfThis, Params& params)
 {
 	const std::string& servername = params[0];
 	const std::string& sid = params[1];
@@ -63,13 +64,33 @@ 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+")");
 	return CMD_SUCCESS;
 }
 
-Link* TreeSocket::AuthRemote(const parameterlist& params)
+void CommandServer::HandleExtra(TreeServer* newserver, Params& params)
+{
+	for (CommandBase::Params::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 CommandBase::Params& params)
 {
 	if (params.size() < 5)
 	{
@@ -77,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];
@@ -94,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))
@@ -107,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;
 	}
 
@@ -119,7 +148,7 @@ Link* TreeSocket::AuthRemote(const parameterlist& params)
  * This is used after the other side of a connection has accepted our credentials.
  * They are then introducing themselves to us, BEFORE either of us burst. -- w
  */
-bool TreeSocket::Outbound_Reply_Server(parameterlist &params)
+bool TreeSocket::Outbound_Reply_Server(CommandBase::Params& params)
 {
 	const Link* x = AuthRemote(params);
 	if (x)
@@ -142,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)
 	{
@@ -152,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);
 
@@ -171,7 +200,7 @@ bool TreeSocket::CheckDuplicate(const std::string& sname, const std::string& sid
  * Someone else is attempting to connect to us if this is called. Validate their credentials etc.
  *		-- w
  */
-bool TreeSocket::Inbound_Server(parameterlist &params)
+bool TreeSocket::Inbound_Server(CommandBase::Params& params)
 {
 	const Link* x = AuthRemote(params);
 	if (x)
@@ -199,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());
 }