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

diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index 9c3a1b8d7..006d51a10 100644
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -21,58 +21,25 @@
 
 #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::Handle(User* user, std::vector<std::string>& params)
 {
-	if (params.size() < 1)
-		return true;
-
-	if (params.size() == 1)
+	TreeServer* server = Utils->FindServer(user->server);
+	if (server->bursting)
 	{
-		TreeServer* ServerSource = Utils->FindServer(prefix);
-		if (ServerSource)
-		{
-			ServerSource->SetPingFlag();
-			long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
-			ServerSource->rtt = ts - ServerSource->LastPingMsec;
-		}
+		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
-	{
-		const std::string& forwardto = params[1];
-		if (forwardto == ServerInstance->Config->GetSID() || forwardto == ServerInstance->Config->ServerName)
-		{
-			/*
-			 * this is a PONG for us
-			 * if the prefix is a user, check theyre local, and if they are,
-			 * dump the PONG reply back to their fd. If its a server, do nowt.
-			 * Services might want to send these s->s, but we dont need to yet.
-			 */
-			User* u = ServerInstance->FindNick(prefix);
-			if (u)
-			{
-				u->WriteServ("PONG %s %s",params[0].c_str(),params[1].c_str());
-			}
 
-			TreeServer *ServerSource = Utils->FindServer(params[0]);
-
-			if (ServerSource)
-			{
-				long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
-				ServerSource->rtt = ts - ServerSource->LastPingMsec;
-				ServerSource->SetPingFlag();
-			}
-		}
-		else
-		{
-			// not for us, pass it on :)
-			Utils->DoOneToOne(prefix,"PONG",params,forwardto);
-		}
+	if (params[0] == ServerInstance->Config->GetSID())
+	{
+		// PONG for us
+		long ts = ServerInstance->Time() * 1000 + (ServerInstance->Time_ns() / 1000000);
+		server->rtt = ts - server->LastPingMsec;
+		server->SetPingFlag();
 	}
-
-	return true;
+	return CMD_SUCCESS;
 }