X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=17bc7cbc69eb90899b3d9c1ad8af0b2fe4a36081;hb=2f35b78fbaadb8d9a6c47ffc198bd97f91af3306;hp=b2967af3bd377bb7789f4f268cc98f598682a2eb;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index b2967af3b..17bc7cbc6 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -35,16 +35,16 @@ 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)
 		{
 			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);
+				a = line.find(' ');
+			}
 			std::string::size_type b = line.find(' ', a + 1);
 			std::string command(line, a + 1, b-a-1);
 			// now try to find a translation entry
@@ -489,9 +489,19 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, Comm
 		params[1].swap(params[3]);
 		params.erase(params.begin()+2, params.begin()+4);
 
-		// If the source of this SERVER message is not bursting, then new servers it introduces are bursting
-		TreeServer* server = TreeServer::Get(who);
-		if (!server->IsBursting())
+		// 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")
@@ -521,7 +531,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, Comm
 		// See if it's a numeric being sent to the target via PUSH
 		unsigned int numeric_number = 0;
 		if (token.length() == 3)
-			numeric_number = ConvToInt(token);
+			numeric_number = ConvToNum<unsigned int>(token);
 
 		if ((numeric_number > 0) && (numeric_number < 1000))
 		{