X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fpong.cpp;h=e88b8cf34b60f7f8158710c74c851257bf030e51;hb=ff766773bc547b03ffa3a15cb1c89896a2a7b8cf;hp=daf53096db1d15d974314f2b8a0b1f8f33b0b038;hpb=2f17664ea13fe8f0983080d69886a46b58e5e266;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/pong.cpp b/src/modules/m_spanningtree/pong.cpp
index daf53096d..e88b8cf34 100644
--- a/src/modules/m_spanningtree/pong.cpp
+++ b/src/modules/m_spanningtree/pong.cpp
@@ -1,6 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -21,32 +26,21 @@
 
 #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, CommandBase::Params& 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
+		server->OnPong();
 	}
-	return true;
+	return CMD_SUCCESS;
 }
-