Merge insp20

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

diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index daf53096db1d15d974314f2b8a0b1f8f33b0b038..a7dc64f83b4c2d011ede3a12e0d30a380aed7625 100644 (file)
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -21,32 +21,23 @@
 
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.h"
-
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+#include "commands.h"
+#include "utils.h"
 
-bool TreeSocket::LocalPong(const std::string &prefix, parameterlist &params)
+CmdResult CommandPong::HandleServer(TreeServer* server, std::vector<std::string>& params)
 {
-       if (params.size() < 1)
-               return true;
-
-       const std::string& forwardto = params[0];
-       if (forwardto == ServerInstance->Config->GetSID())
+       if (server->IsBursting())
        {
-               // PONG for us
-               TreeServer* ServerSource = Utils->FindServer(prefix);
-               if (ServerSource)
-               {
-                       long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
-                       ServerSource->rtt = ts - ServerSource->LastPingMsec;
-                       ServerSource->SetPingFlag();
-               }
+               ServerInstance->SNO->WriteGlobalSno('l', "Server \002%s\002 has not finished burst, forcing end of burst (send ENDBURST!)", server->GetName().c_str());
+               server->FinishBurst();
        }
-       else
+
+       if (params[0] == ServerInstance->Config->GetSID())
        {
-               // not for us, pass it on :)
-               Utils->DoOneToOne(prefix,"PONG",params,forwardto);
+               // PONG for us
+               long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
+               server->rtt = ts - server->LastPingMsec;
+               server->SetPingFlag();
        }
-       return true;
+       return CMD_SUCCESS;
 }
-