Implement support for IRCv3 client-to-client tags.

[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 63fc9cf6ce97e4f347fbc45ea1498467fc359f73..17b44f896a0155a96def168997390e1f95c1e004 100644 (file)
--- 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
@@ -253,7 +253,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)
@@ -267,7 +267,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)
@@ -309,6 +309,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 +325,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 +337,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] == '#'))
        {
@@ -381,7 +386,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]);
 
@@ -424,7 +429,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";
@@ -489,9 +494,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")
@@ -512,16 +527,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))
                {
@@ -545,10 +560,10 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                        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 +572,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 +580,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
                {