X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=1504a88075d4e6b326a57b859a53faa5a53d66b9;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=e2eb31f0d25505ab9c5b8a756747a64940cfc6b1;hpb=645f7e18c64a6628ede880dc69bf8825ba93b375;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index e2eb31f0d..1504a8807 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))
 					{
@@ -245,7 +241,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
@@ -302,6 +298,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 +429,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.