X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=fc9700740d42492a76effffe591fcbda5bd213cc;hb=f6b33a8facd6ca200292786c1061782c41cdd278;hp=9cd081e1e770dbb682ea1abe6f7acb798e84f883;hpb=a3f0ce79d0b9674bfc0c3359f8c87e528ce74fed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 9cd081e1e..fc9700740 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -24,25 +24,31 @@
 
 static std::string newline("\n");
 
+void TreeSocket::WriteLineNoCompat(const std::string& line)
+{
+	ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
+	this->WriteData(line);
+	this->WriteData(newline);
+}
+
 void TreeSocket::WriteLine(const std::string& original_line)
 {
 	if (LinkState == CONNECTED)
 	{
-		if (original_line.c_str()[0] != ':')
-		{
-			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Sending line without server prefix!");
-			WriteLine(":" + ServerInstance->Config->GetSID() + " " + original_line);
-			return;
-		}
-		if (proto_version != ProtocolVersion)
+		if (proto_version != PROTO_NEWEST)
 		{
 			std::string line = original_line;
 			std::string::size_type a = line.find(' ');
+			if (line[0] == '@')
+			{
+				// The line contains tags which the 1202 protocol can't handle.
+				line.erase(0, a + 1);
+				a = line.find(' ');
+			}
 			std::string::size_type b = line.find(' ', a + 1);
-			std::string command = line.substr(a + 1, b-a-1);
+			std::string command(line, a + 1, b-a-1);
 			// now try to find a translation entry
-			// TODO a more efficient lookup method will be needed later
-			if (proto_version < 1205)
+			if (proto_version < PROTO_INSPIRCD_30)
 			{
 				if (command == "IJOIN")
 				{
@@ -61,7 +67,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 					{
 						// No TS or modes in the command
 						// :22DAAAAAB IJOIN #chan
-						const std::string channame = line.substr(b+1, c-b-1);
+						const std::string channame(line, b+1, c-b-1);
 						Channel* chan = ServerInstance->FindChan(channame);
 						if (!chan)
 							return;
@@ -246,7 +252,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				}
 				else if (command == "SINFO")
 				{
-					// :22D SINFO version :InspIRCd-2.2
+					// :22D SINFO version :InspIRCd-3.0
 					//     A     B       C
 					std::string::size_type c = line.find(' ', b + 1);
 					if (c == std::string::npos)
@@ -260,7 +266,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				}
 				else if (command == "SERVER")
 				{
-					// :001 SERVER inspircd.test 002 [<anything> ...] :gecos
+					// :001 SERVER inspircd.test 002 [<anything> ...] :description
 					//     A      B             C
 					std::string::size_type c = line.find(' ', b + 1);
 					if (c == std::string::npos)
@@ -273,23 +279,52 @@ void TreeSocket::WriteLine(const std::string& original_line)
 
 					line.erase(d, spcolon-d);
 					line.insert(c, " * 0");
+
+					if (burstsent)
+					{
+						WriteLineNoCompat(line);
+
+						// Synthesize a :<newserver> BURST <time> message
+						spcolon = line.find(" :");
+						line = CmdBuilder(line.substr(spcolon-3, 3), "BURST").push_int(ServerInstance->Time()).str();
+					}
+				}
+				else if (command == "NUM")
+				{
+					// :<sid> NUM <numeric source sid> <target uuid> <3 digit number> <params>
+					// Translate to
+					// :<sid> PUSH <target uuid> :<numeric source name> <3 digit number> <target nick> <params>
+
+					TreeServer* const numericsource = Utils->FindServerID(line.substr(9, 3));
+					if (!numericsource)
+						return;
+
+					// The nick of the target is necessary for building the PUSH message
+					User* const target = ServerInstance->FindUUID(line.substr(13, UIDGenerator::UUID_LENGTH));
+					if (!target)
+						return;
+
+					std::string push = InspIRCd::Format(":%.*s PUSH %s ::%s %.*s %s", 3, line.c_str()+1, target->uuid.c_str(), numericsource->GetName().c_str(), 3, line.c_str()+23, target->nick.c_str());
+					push.append(line, 26, std::string::npos);
+					push.swap(line);
+				}
+				else if (command == "TAGMSG")
+				{
+					// Drop IRCv3 tag messages as v2 has no message tag support.
+					return;
 				}
 			}
-			ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
-			this->WriteData(line);
-			this->WriteData(newline);
+			WriteLineNoCompat(line);
 			return;
 		}
 	}
 
-	ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), original_line.c_str());
-	this->WriteData(original_line);
-	this->WriteData(newline);
+	WriteLineNoCompat(original_line);
 }
 
 namespace
 {
-	bool InsertCurrentChannelTS(std::vector<std::string>& params, unsigned int chanindex = 0, unsigned int pos = 1)
+	bool InsertCurrentChannelTS(CommandBase::Params& params, unsigned int chanindex = 0, unsigned int pos = 1)
 	{
 		Channel* chan = ServerInstance->FindChan(params[chanindex]);
 		if (!chan)
@@ -301,7 +336,7 @@ namespace
 	}
 }
 
-bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector<std::string>& params)
+bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, CommandBase::Params& params)
 {
 	if ((cmd == "METADATA") && (params.size() >= 3) && (params[0][0] == '#'))
 	{
@@ -350,7 +385,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		if ((params.size() != 1) && (params.size() != 3))
 			return false;
 
-		parameterlist p;
+		CommandBase::Params p;
 		p.push_back(cmd.substr(0, 1));
 		p.push_back(params[0]);
 
@@ -393,7 +428,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 	}
 	else if (cmd == "MODENOTICE")
 	{
-		// MODENOTICE is always supported by 2.0 but it's optional in 2.2.
+		// MODENOTICE is always supported by 2.0 but it's optional in 3.0.
 		params.insert(params.begin(), "*");
 		params.insert(params.begin()+1, cmd);
 		cmd = "ENCAP";
@@ -457,6 +492,107 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 
 		params[1].swap(params[3]);
 		params.erase(params.begin()+2, params.begin()+4);
+
+		// If the source of this SERVER message or any of its parents are bursting, then new servers it
+		// introduces are not bursting.
+		bool bursting = false;
+		for (TreeServer* server = TreeServer::Get(who); server; server = server->GetParent())
+		{
+			if (server->IsBursting())
+			{
+				bursting = true;
+				break;
+			}
+		}
+
+		if (!bursting)
+			params.insert(params.begin()+2, "burst=" + ConvToStr(((uint64_t)ServerInstance->Time())*1000));
+	}
+	else if (cmd == "BURST")
+	{
+		// A server is introducing another one, drop unnecessary BURST
+		return false;
+	}
+	else if (cmd == "SVSWATCH")
+	{
+		// SVSWATCH was removed because nothing was using it, but better be sure
+		return false;
+	}
+	else if (cmd == "SVSSILENCE")
+	{
+		// SVSSILENCE was removed because nothing was using it, but better be sure
+		return false;
+	}
+	else if (cmd == "PUSH")
+	{
+		if ((params.size() != 2) || (!this->MyRoot))
+			return false; // Huh?
+
+		irc::tokenstream ts(params.back());
+
+		std::string srcstr;
+		ts.GetMiddle(srcstr);
+		srcstr.erase(0, 1);
+
+		std::string token;
+		ts.GetMiddle(token);
+
+		// See if it's a numeric being sent to the target via PUSH
+		unsigned int numeric_number = 0;
+		if (token.length() == 3)
+			numeric_number = ConvToNum<unsigned int>(token);
+
+		if ((numeric_number > 0) && (numeric_number < 1000))
+		{
+			// It's a numeric, translate to NUM
+
+			// srcstr must be a valid server name
+			TreeServer* const numericsource = Utils->FindServer(srcstr);
+			if (!numericsource)
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH numeric %s to user %s from 1202 protocol server %s: source \"%s\" doesn't exist", token.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), srcstr.c_str());
+				return false;
+			}
+
+			cmd = "NUM";
+
+			// Second parameter becomes the target uuid
+			params[0].swap(params[1]);
+			// Replace first param (now the PUSH payload, not needed) with the source sid
+			params[0] = numericsource->GetID();
+
+			params.push_back(InspIRCd::Format("%03u", numeric_number));
+
+			// Ignore the nickname in the numeric in PUSH
+			ts.GetMiddle(token);
+
+			// Rest of the tokens are the numeric parameters, add them to NUM
+			while (ts.GetTrailing(token))
+				params.push_back(token);
+		}
+		else if ((token == "PRIVMSG") || (token == "NOTICE"))
+		{
+			// Command is a PRIVMSG/NOTICE
+			cmd.swap(token);
+
+			// Check if the PRIVMSG/NOTICE target is a nickname
+			ts.GetMiddle(token);
+			if (token.c_str()[0] == '#')
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH %s to user %s from 1202 protocol server %s, target \"%s\"", cmd.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), token.c_str());
+				return false;
+			}
+
+			// Replace second parameter with the message
+			ts.GetTrailing(params[1]);
+		}
+		else
+		{
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unable to translate PUSH to user %s from 1202 protocol server %s", params[0].c_str(), this->MyRoot->GetName().c_str());
+			return false;
+		}
+
+		return true;
 	}
 
 	return true; // Passthru