X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=433da98470ccd4685769f2689948dd0abcc762da;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=bfc2d1560a78537fb5503647eddc36bd752d0a9e;hpb=1626437cbf963b16ce44ef6cc829957fd3a7e2ff;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index bfc2d1560..433da9847 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -20,6 +20,7 @@
 #include "inspircd.h"
 #include "main.h"
 #include "treesocket.h"
+#include "treeserver.h"
 
 static std::string newline("\n");
 
@@ -90,6 +91,55 @@ void TreeSocket::WriteLine(std::string line)
 				}
 				else if (command == "RESYNC")
 					return;
+				else if (command == "METADATA")
+				{
+					// Drop TS for channel METADATA
+					// :sid METADATA #target TS extname ...
+					//     A        B       C  D
+					if (b == std::string::npos)
+						return;
+
+					std::string::size_type c = line.find(' ', b + 1);
+					if (c == std::string::npos)
+						return;
+
+					if (line[b + 1] == '#')
+					{
+						// We're sending channel metadata
+						std::string::size_type d = line.find(' ', c + 1);
+						if (d == std::string::npos)
+							return;
+
+						line.erase(c, d-c);
+					}
+				}
+				else if (command == "FTOPIC")
+				{
+					// Drop channel TS for FTOPIC
+					// :sid FTOPIC #target TS TopicTS ...
+					//     A      B       C  D
+					if (b == std::string::npos)
+						return;
+
+					std::string::size_type c = line.find(' ', b + 1);
+					if (c == std::string::npos)
+						return;
+
+					std::string::size_type d = line.find(' ', c + 1);
+					if (d == std::string::npos)
+						return;
+
+					line.erase(c, d-c);
+				}
+				else if ((command == "PING") || (command == "PONG"))
+				{
+					// :22D PING 20D
+					if (line.length() < 13)
+						return;
+
+					// Insert the source SID (and a space) between the command and the first parameter
+					line.insert(10, line.substr(1, 4));
+				}
 			}
 		}
 	}
@@ -98,3 +148,64 @@ void TreeSocket::WriteLine(std::string line)
 	this->WriteData(line);
 	this->WriteData(newline);
 }
+
+namespace
+{
+	bool InsertCurrentChannelTS(std::vector<std::string>& params)
+	{
+		Channel* chan = ServerInstance->FindChan(params[0]);
+		if (!chan)
+			return false;
+
+		// Insert the current TS of the channel between the first and the second parameters
+		params.insert(params.begin()+1, ConvToStr(chan->age));
+		return true;
+	}
+}
+
+bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector<std::string>& params)
+{
+	if ((cmd == "METADATA") && (params.size() >= 3))
+	{
+		// :20D METADATA #channel extname :extdata
+		return InsertCurrentChannelTS(params);
+	}
+	else if ((cmd == "FTOPIC") && (params.size() >= 4))
+	{
+		// :20D FTOPIC #channel 100 Attila :topic text
+		return InsertCurrentChannelTS(params);
+	}
+	else if ((cmd == "PING") || (cmd == "PONG"))
+	{
+		if (params.size() == 1)
+		{
+			// If it's a PING with 1 parameter, reply with a PONG now, if it's a PONG with 1 parameter (weird), do nothing
+			if (cmd[1] == 'I')
+				this->WriteData(":" + ServerInstance->Config->GetSID() + " PONG " + params[0] + newline);
+
+			// Don't process this message further
+			return false;
+		}
+
+		// :20D PING 20D 22D
+		// :20D PONG 20D 22D
+		// Drop the first parameter
+		params.erase(params.begin());
+
+		// If the target is a server name, translate it to a SID
+		if (!InspIRCd::IsSID(params[0]))
+		{
+			TreeServer* server = Utils->FindServer(params[0]);
+			if (!server)
+			{
+				// We've no idea what this is, log and stop processing
+				ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Received a " + cmd + " with an unknown target: \"" + params[0] + "\", command dropped");
+				return false;
+			}
+
+			params[0] = server->GetID();
+		}
+	}
+
+	return true; // Passthru
+}