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

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 433da9847..41cabbc93 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)
@@ -140,11 +140,24 @@ void TreeSocket::WriteLine(std::string line)
 					// Insert the source SID (and a space) between the command and the first parameter
 					line.insert(10, line.substr(1, 4));
 				}
+				else if (command == "OPERTYPE")
+				{
+					std::string::size_type colon = line.find(':', b);
+					if (colon != std::string::npos)
+					{
+						for (std::string::iterator i = line.begin()+colon; i != line.end(); ++i)
+						{
+							if (*i == ' ')
+								*i = '_';
+						}
+						line.erase(colon, 1);
+					}
+				}
 			}
 		}
 	}
 
-	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);
 }
@@ -165,7 +178,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);
@@ -199,13 +212,40 @@ 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";
+	}
 
 	return true; // Passthru
 }