X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=42fb708a9589052bbc2c0a84381978c8fa884eca;hb=c23d09f65084e6088111dc974f0e290b042de89d;hp=e2eb31f0d25505ab9c5b8a756747a64940cfc6b1;hpb=a5fe50aca04ca554d313e7361c571c6a497a9c4e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index e2eb31f0d..42fb708a9 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -23,14 +23,10 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
 #include "main.h"
 #include "utils.h"
 #include "treeserver.h"
-#include "link.h"
 #include "treesocket.h"
 #include "resolvers.h"
 
@@ -151,7 +147,7 @@ void TreeSocket::ProcessLine(std::string &line)
 			{
 				if (params.size())
 				{
-					time_t them = atoi(params[0].c_str());
+					time_t them = ConvToInt(params[0]);
 					time_t delta = them - ServerInstance->Time();
 					if ((delta < -600) || (delta > 600))
 					{
@@ -164,9 +160,21 @@ void TreeSocket::ProcessLine(std::string &line)
 						ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta));
 					}
 				}
+
+				// Check for duplicate server name/sid again, it's possible that a new
+				// server was introduced while we were waiting for them to send BURST.
+				// (we do not reserve their server name/sid when they send SERVER, we do it now)
+				if (!CheckDuplicate(capab->name, capab->sid))
+					return;
+
 				this->LinkState = CONNECTED;
 				Utils->timeoutlist.erase(this);
 
+				linkID = capab->name;
+
+				MyRoot = new TreeServer(Utils, capab->name, capab->description, capab->sid, Utils->TreeRoot, this, capab->hidden);
+				Utils->TreeRoot->AddChild(MyRoot);
+
 				MyRoot->bursting = true;
 				this->DoBurst(MyRoot);
 
@@ -245,7 +253,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 			 * crossing the users QUIT further upstream from the server. Thanks jilles!
 			 */
 
-			if ((prefix.length() == UUID_LENGTH-1) && (isdigit(prefix[0])) &&
+			if ((prefix.length() == UIDGenerator::UUID_LENGTH) && (isdigit(prefix[0])) &&
 				((command == "FMODE") || (command == "MODE") || (command == "KICK") || (command == "TOPIC") || (command == "KILL") || (command == "ADDLINE") || (command == "DELLINE")))
 			{
 				/* Special case, we cannot drop these commands as they've been committed already on a
@@ -290,7 +298,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 	if ((!route_back_again) || (route_back_again->GetSocket() != this))
 	{
 		if (route_back_again)
-			ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"Protocol violation: Fake direction '%s' from connection '%s'",
+			ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Protocol violation: Fake direction '%s' from connection '%s'",
 				prefix.c_str(),linkID.c_str());
 		return;
 	}
@@ -302,6 +310,12 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 	if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
 		command = "MODE";
 
+	if (proto_version < ProtocolVersion)
+	{
+		if (!PreProcessOldProtocolMessage(who, command, params))
+			return;
+	}
+
 	// TODO move all this into Commands
 	if (command == "MAP")
 	{
@@ -427,7 +441,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 		}
 
 		/* Update timestamp on user when they change nicks */
-		who->age = atoi(params[1].c_str());
+		who->age = ConvToInt(params[1]);
 
 		/*
 		 * On nick messages, check that the nick doesnt already exist here.
@@ -449,7 +463,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 				return;
 			}
 		}
-		who->ForceNickChange(params[0].c_str());
+		who->ForceNickChange(params[0]);
 		Utils->RouteCommand(route_back_again, command, params, who);
 	}
 	else
@@ -458,7 +472,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 		if (!cmd)
 		{
-			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+			irc::stringjoiner pmlist(params);
 			ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Unrecognised S2S command :%s %s %s",
 				who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
 			SendError("Unrecognised command '" + command + "' -- possibly loaded mismatched modules");
@@ -467,7 +481,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 		if (params.size() < cmd->min_params)
 		{
-			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+			irc::stringjoiner pmlist(params);
 			ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Insufficient parameters for S2S command :%s %s %s",
 				who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
 			SendError("Insufficient parameters for command '" + command + "'");
@@ -486,7 +500,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 		if (res == CMD_INVALID)
 		{
-			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
+			irc::stringjoiner pmlist(params);
 			ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Error handling S2S command :%s %s %s",
 				who->uuid.c_str(), command.c_str(), pmlist.GetJoined().c_str());
 			SendError("Error handling '" + command + "' -- possibly loaded mismatched modules");