X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=0fc837beb939cec4c8794ed71ad1d508a79bea77;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=17266afe9a6a933c7bc8332e544cae16a744f5da;hpb=d9d99cd02dadf34bfcc220734ba0c422f0acb3e6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 17266afe9..0fc837beb 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -30,7 +30,7 @@ void TreeSocket::WriteLine(std::string line)
 	{
 		if (line[0] != ':')
 		{
-			ServerInstance->Logs->Log("m_spanningtree", LOG_DEFAULT, "Sending line without server prefix!");
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Sending line without server prefix!");
 			line = ":" + ServerInstance->Config->GetSID() + " " + line;
 		}
 		if (proto_version != ProtocolVersion)
@@ -93,7 +93,7 @@ void TreeSocket::WriteLine(std::string line)
 					return;
 				else if (command == "METADATA")
 				{
-					// Drop TS for channel METADATA
+					// Drop TS for channel METADATA, translate METADATA operquit into an OPERQUIT command
 					// :sid METADATA #target TS extname ...
 					//     A        B       C  D
 					if (b == std::string::npos)
@@ -103,15 +103,20 @@ void TreeSocket::WriteLine(std::string line)
 					if (c == std::string::npos)
 						return;
 
+					std::string::size_type d = line.find(' ', c + 1);
+					if (d == 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 (line.substr(c, d-c) == " operquit")
+					{
+						// ":22D METADATA 22DAAAAAX operquit :message" -> ":22DAAAAAX OPERQUIT :message"
+						line = ":" + line.substr(b+1, c-b) + "OPERQUIT" + line.substr(d);
+					}
 				}
 				else if (command == "FTOPIC")
 				{
@@ -157,7 +162,7 @@ void TreeSocket::WriteLine(std::string line)
 		}
 	}
 
-	ServerInstance->Logs->Log("m_spanningtree", LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
+	ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
 	this->WriteData(line);
 	this->WriteData(newline);
 }
@@ -178,7 +183,7 @@ namespace
 
 bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector<std::string>& params)
 {
-	if ((cmd == "METADATA") && (params.size() >= 3))
+	if ((cmd == "METADATA") && (params.size() >= 3) && (params[0][0] == '#'))
 	{
 		// :20D METADATA #channel extname :extdata
 		return InsertCurrentChannelTS(params);
@@ -212,13 +217,51 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 			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");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received a " + cmd + " with an unknown target: \"" + params[0] + "\", command dropped");
 				return false;
 			}
 
 			params[0] = server->GetID();
 		}
 	}
+	else if ((cmd == "GLINE") || (cmd == "KLINE") || (cmd == "ELINE") || (cmd == "ZLINE") || (cmd == "QLINE"))
+	{
+		// Fix undocumented protocol usage: translate GLINE, ZLINE, etc. into ADDLINE or DELLINE
+		if ((params.size() != 1) && (params.size() != 3))
+			return false;
+
+		parameterlist p;
+		p.push_back(cmd.substr(0, 1));
+		p.push_back(params[0]);
+
+		if (params.size() == 3)
+		{
+			cmd = "ADDLINE";
+			p.push_back(who->nick);
+			p.push_back(ConvToStr(ServerInstance->Time()));
+			p.push_back(ConvToStr(InspIRCd::Duration(params[1])));
+			p.push_back(params[2]);
+		}
+		else
+			cmd = "DELLINE";
+
+		params.swap(p);
+	}
+	else if (cmd == "SVSMODE")
+	{
+		cmd = "MODE";
+	}
+	else if (cmd == "OPERQUIT")
+	{
+		// Translate OPERQUIT into METADATA
+		if (params.empty())
+			return false;
+
+		cmd = "METADATA";
+		params.insert(params.begin(), who->uuid);
+		params.insert(params.begin()+1, "operquit");
+		who = MyRoot->ServerUser;
+	}
 
 	return true; // Passthru
 }