X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpong.cpp;h=006d51a101c7fc00dd333935ccde2e8f2ca667ae;hb=67de413cad88194972d55a8ff88464370890c5a9;hp=034f1f8914256d44025b8dfe52ba3019d35a1a38;hpb=b7e793d96131e7813fe42984ec3a04254720ad20;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 034f1f891..006d51a10 100644
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -21,30 +21,25 @@
 
 #include "utils.h"
 #include "treeserver.h"
-#include "treesocket.h"
+#include "commands.h"
+#include "utils.h"
 
-bool TreeSocket::LocalPong(const std::string &prefix, parameterlist &params)
+CmdResult CommandPong::Handle(User* user, std::vector<std::string>& params)
 {
-	if (params.size() < 1)
-		return true;
-
-	const std::string& forwardto = params[0];
-	if (forwardto == ServerInstance->Config->GetSID())
+	TreeServer* server = Utils->FindServer(user->server);
+	if (server->bursting)
 	{
-		// 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;
 }