X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=966d624bbb4807a62547d6146757e6b7166ba404;hb=a4305d8f3c3e613be839bdcd61a1d14c87fed5aa;hp=dc24802fbac61911c11105b7160b5ef5eb47f22f;hpb=f5de55813bce3197f5f866527c2c8b0769efcd01;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index dc24802fb..966d624bb 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -155,19 +155,19 @@ void TreeSocket::ProcessLine(std::string &line)
 			}
 			else if (command == "BURST")
 			{
-				if (params.size())
+				if (!params.empty())
 				{
 					time_t them = ConvToNum<time_t>(params[0]);
 					time_t delta = them - ServerInstance->Time();
-					if ((delta < -600) || (delta > 600))
+					if ((delta < -60) || (delta > 60))
 					{
-						ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %ld seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",labs((long)delta));
-						SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+						ServerInstance->SNO->WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than one minute). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
+						SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than one minute). Link aborted, PLEASE SYNC YOUR CLOCKS!");
 						return;
 					}
-					else if ((delta < -30) || (delta > 30))
+					else if ((delta < -15) || (delta > 15))
 					{
-						ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %ld seconds. Please consider synching your clocks.", labs((long)delta));
+						ServerInstance->SNO->WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta));
 					}
 				}
 
@@ -292,7 +292,7 @@ void TreeSocket::ProcessTag(User* source, const std::string& tag, ClientProtocol
 	for (Events::ModuleEventProvider::SubscriberList::const_iterator i = list.begin(); i != list.end(); ++i)
 	{
 		ClientProtocol::MessageTagProvider* const tagprov = static_cast<ClientProtocol::MessageTagProvider*>(*i);
-		const ModResult res = tagprov->OnClientProtocolProcessTag(source, tagkey, tagval);
+		const ModResult res = tagprov->OnProcessTag(source, tagkey, tagval);
 		if (res == MOD_RES_ALLOW)
 			tags.insert(std::make_pair(tagkey, ClientProtocol::MessageTagData(tagprov, tagval)));
 		else if (res == MOD_RES_DENY)
@@ -333,7 +333,7 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
 	}
 
 	// Translate commands coming from servers using an older protocol
-	if (proto_version < ProtocolVersion)
+	if (proto_version < PROTO_NEWEST)
 	{
 		if (!PreProcessOldProtocolMessage(who, command, params))
 			return;
@@ -376,22 +376,25 @@ void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix,
 	}
 
 	CmdResult res;
+	ClientProtocol::TagMap tags;
+	std::string tag;
+	irc::sepstream tagstream(taglist, ';');
+	while (tagstream.GetToken(tag))
+		ProcessTag(who, tag, tags);
+
+	CommandBase::Params newparams(params, tags);
+
 	if (scmd)
-		res = scmd->Handle(who, params);
+		res = scmd->Handle(who, newparams);
 	else
 	{
-		ClientProtocol::TagMap tags;
-		std::string tag;
-		irc::sepstream tagstream(taglist, ';');
-		while (tagstream.GetToken(tag))
-			ProcessTag(who, tag, tags);
-		res = cmd->Handle(who, CommandBase::Params(params, tags));
+		res = cmd->Handle(who, newparams);
 		if (res == CMD_INVALID)
 			throw ProtocolException("Error in command handler");
 	}
 
 	if (res == CMD_SUCCESS)
-		Utils->RouteCommand(server->GetRoute(), cmdbase, params, who);
+		Utils->RouteCommand(server->GetRoute(), cmdbase, newparams, who);
 }
 
 void TreeSocket::OnTimeout()
@@ -414,13 +417,13 @@ void TreeSocket::Close()
 	if (MyRoot)
 		MyRoot->SQuit(getError());
 
-	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str());
+	ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed.", linkID.c_str());
 
 	time_t server_uptime = ServerInstance->Time() - this->age;
 	if (server_uptime)
 	{
-		std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime);
-		ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str());
+		std::string timestr = InspIRCd::DurationString(server_uptime);
+		ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' was established for %s", linkID.c_str(), timestr.c_str());
 	}
 }