Allow Channel::WriteNotice send to other servers and status ranks.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / compat.cpp

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index 98b4be88d1a7da0091545a01ca23ec002f8f1e0a..270aad9540c5498c5e829b36de1e725c022d85d8 100644 (file)
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -35,21 +35,20 @@ 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, 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")
                                {
@@ -287,7 +286,12 @@ void TreeSocket::WriteLine(const std::string& original_line)
 
                                                // Synthesize a :<newserver> BURST <time> message
                                                spcolon = line.find(" :");
-                                               line = CmdBuilder(line.substr(spcolon-3, 3), "BURST").push_int(ServerInstance->Time()).str();
+
+                                               TreeServer* const source = Utils->FindServerID(line.substr(spcolon-3, 3));
+                                               if (!source)
+                                                       return;
+
+                                               line = CmdBuilder(source, "BURST").push_int(ServerInstance->Time()).str();
                                        }
                                }
                                else if (command == "NUM")
@@ -309,6 +313,11 @@ void TreeSocket::WriteLine(const std::string& original_line)
                                        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;
+                               }
                        }
                        WriteLineNoCompat(line);
                        return;
@@ -320,7 +329,7 @@ void TreeSocket::WriteLine(const std::string& 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)
@@ -332,7 +341,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] == '#'))
        {
@@ -372,7 +381,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                                return false;
                        }
 
-                       params[0] = server->GetID();
+                       params[0] = server->GetId();
                }
        }
        else if ((cmd == "GLINE") || (cmd == "KLINE") || (cmd == "ELINE") || (cmd == "ZLINE") || (cmd == "QLINE"))
@@ -381,7 +390,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]);
 
@@ -489,9 +498,19 @@ 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 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")
@@ -504,6 +523,11 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                // 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))
@@ -512,16 +536,16 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                irc::tokenstream ts(params.back());
 
                std::string srcstr;
-               ts.GetToken(srcstr);
+               ts.GetMiddle(srcstr);
                srcstr.erase(0, 1);
 
                std::string token;
-               ts.GetToken(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 = ConvToInt(token);
+                       numeric_number = ConvToNum<unsigned int>(token);
 
                if ((numeric_number > 0) && (numeric_number < 1000))
                {
@@ -540,15 +564,15 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                        // 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[0] = numericsource->GetId();
 
                        params.push_back(InspIRCd::Format("%03u", numeric_number));
 
                        // Ignore the nickname in the numeric in PUSH
-                       ts.GetToken(token);
+                       ts.GetMiddle(token);
 
                        // Rest of the tokens are the numeric parameters, add them to NUM
-                       while (ts.GetToken(token))
+                       while (ts.GetTrailing(token))
                                params.push_back(token);
                }
                else if ((token == "PRIVMSG") || (token == "NOTICE"))
@@ -557,7 +581,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                        cmd.swap(token);
 
                        // Check if the PRIVMSG/NOTICE target is a nickname
-                       ts.GetToken(token);
+                       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());
@@ -565,7 +589,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                        }
 
                        // Replace second parameter with the message
-                       ts.GetToken(params[1]);
+                       ts.GetTrailing(params[1]);
                }
                else
                {