X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=f2ea0808f7f9a821955732c58b428844aa77d853;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=1b3b9dae2e8bba907a04097e4f0367cbf099ee29;hpb=b36ce84c7da93f680fc397bcb4c877abe063eaaa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 1b3b9dae2..f2ea0808f 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -80,7 +80,7 @@ void TreeSocket::ProcessLine(std::string &line)
 	std::string command;
 	parameterlist params;
 
-	ServerInstance->Logs->Log("m_spanningtree", LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str());
+	ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str());
 
 	Split(line, prefix, command, params);
 
@@ -172,7 +172,7 @@ void TreeSocket::ProcessLine(std::string &line)
 
 				linkID = capab->name;
 
-				MyRoot = new TreeServer(Utils, capab->name, capab->description, capab->sid, Utils->TreeRoot, this, capab->hidden);
+				MyRoot = new TreeServer(capab->name, capab->description, capab->sid, Utils->TreeRoot, this, capab->hidden);
 				Utils->TreeRoot->AddChild(MyRoot);
 
 				MyRoot->bursting = true;
@@ -267,7 +267,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 			}
 			else
 			{
-				ServerInstance->Logs->Log("m_spanningtree", LOG_DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.",
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Command '%s' from unknown prefix '%s'! Dropping entire command.",
 					command.c_str(), prefix.c_str());
 				return;
 			}
@@ -298,18 +298,12 @@ 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(MODNAME, LOG_DEBUG, "Protocol violation: Fake direction '%s' from connection '%s'",
 				prefix.c_str(),linkID.c_str());
 		return;
 	}
 
-	/*
-	 * First up, check for any malformed commands (e.g. MODE without a timestamp)
-	 * and rewrite commands where necessary (SVSMODE -> MODE for services). -- w
-	 */
-	if (command == "SVSMODE") // This isn't in an "else if" so we still force FMODE for changes on channels.
-		command = "MODE";
-
+	// Translate commands coming from servers using an older protocol
 	if (proto_version < ProtocolVersion)
 	{
 		if (!PreProcessOldProtocolMessage(who, command, params))
@@ -464,7 +458,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 			}
 		}
 		who->ForceNickChange(params[0]);
-		Utils->RouteCommand(route_back_again, command, params, who);
+		Utils->DoOneToAllButSender(prefix, command, params, prefix);
 	}
 	else
 	{
@@ -472,8 +466,8 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 		if (!cmd)
 		{
-			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
-			ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Unrecognised S2S command :%s %s %s",
+			irc::stringjoiner pmlist(params);
+			ServerInstance->Logs->Log(MODNAME, 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");
 			return;
@@ -481,8 +475,8 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 		if (params.size() < cmd->min_params)
 		{
-			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
-			ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Insufficient parameters for S2S command :%s %s %s",
+			irc::stringjoiner pmlist(params);
+			ServerInstance->Logs->Log(MODNAME, 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 + "'");
 			return;
@@ -500,13 +494,13 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command,
 
 		if (res == CMD_INVALID)
 		{
-			irc::stringjoiner pmlist(" ", params, 0, params.size() - 1);
-			ServerInstance->Logs->Log("m_spanningtree", LOG_SPARSE, "Error handling S2S command :%s %s %s",
+			irc::stringjoiner pmlist(params);
+			ServerInstance->Logs->Log(MODNAME, 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");
 		}
 		else if (res == CMD_SUCCESS)
-			Utils->RouteCommand(route_back_again, command, params, who);
+			Utils->RouteCommand(route_back_again, cmd, params, who);
 	}
 }