]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_spanningtree/compat.cpp
m_spanningtree Rewrite PING logic to use Timers
[user/henk/code/inspircd.git] / src / modules / m_spanningtree / compat.cpp
index 0f55793f1d722fde5ded68d82b736c94f6c453df..c2ee940fccb6e2e18fb73d5ba08defa4632cfa5e 100644 (file)
 
 static std::string newline("\n");
 
+void TreeSocket::WriteLineNoCompat(const std::string& line)
+{
+       ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
+       this->WriteData(line);
+       this->WriteData(newline);
+}
+
 void TreeSocket::WriteLine(const std::string& original_line)
 {
        if (LinkState == CONNECTED)
@@ -39,7 +46,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
                        std::string line = original_line;
                        std::string::size_type a = line.find(' ');
                        std::string::size_type b = line.find(' ', a + 1);
-                       std::string command = line.substr(a + 1, b-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)
@@ -61,7 +68,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
                                        {
                                                // No TS or modes in the command
                                                // :22DAAAAAB IJOIN #chan
-                                               const std::string channame = line.substr(b+1, c-b-1);
+                                               const std::string channame(line, b+1, c-b-1);
                                                Channel* chan = ServerInstance->FindChan(channame);
                                                if (!chan)
                                                        return;
@@ -258,17 +265,38 @@ void TreeSocket::WriteLine(const std::string& original_line)
 
                                        line = line.substr(0, 5) + "VERSION" + line.substr(c);
                                }
+                               else if (command == "SERVER")
+                               {
+                                       // :001 SERVER inspircd.test 002 [<anything> ...] :gecos
+                                       //     A      B             C
+                                       std::string::size_type c = line.find(' ', b + 1);
+                                       if (c == std::string::npos)
+                                               return;
+
+                                       std::string::size_type d = c + 4;
+                                       std::string::size_type spcolon = line.find(" :", d);
+                                       if (spcolon == std::string::npos)
+                                               return;
+
+                                       line.erase(d, spcolon-d);
+                                       line.insert(c, " * 0");
+
+                                       if (burstsent)
+                                       {
+                                               WriteLineNoCompat(line);
+
+                                               // Synthesize a :<newserver> BURST <time> message
+                                               spcolon = line.find(" :");
+                                               line = CmdBuilder(line.substr(spcolon-3, 3), "BURST").push_int(ServerInstance->Time()).str();
+                                       }
+                               }
                        }
-                       ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
-                       this->WriteData(line);
-                       this->WriteData(newline);
+                       WriteLineNoCompat(line);
                        return;
                }
        }
 
-       ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), original_line.c_str());
-       this->WriteData(original_line);
-       this->WriteData(newline);
+       WriteLineNoCompat(original_line);
 }
 
 namespace
@@ -432,6 +460,26 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
                        params.erase(params.begin()+1);
                }
        }
+       else if ((cmd == "SERVER") && (params.size() > 4))
+       {
+               // This does not affect the initial SERVER line as it is sent before the link state is CONNECTED
+               // :20D SERVER <name> * 0 <sid> <desc>
+               // change to
+               // :20D SERVER <name> <sid> <desc>
+
+               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())
+                       params.insert(params.begin()+2, "burst=" + ConvToStr(ServerInstance->Time()*1000));
+       }
+       else if (cmd == "BURST")
+       {
+               // A server is introducing another one, drop unnecessary BURST
+               return false;
+       }
 
        return true; // Passthru
 }