X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fping.cpp;h=df4d920735e7286ba67f73b5db783ba0bd2b0c5a;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=97cc44b6fff28224d097166c3e1d1d9c5570c900;hpb=553a8da754c8cd308bad2008018849714e70f9b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index 97cc44b6f..df4d92073 100644
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -1,6 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 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
@@ -18,44 +23,24 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "xline.h"
-#include "socketengine.h"
 
-#include "main.h"
 #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::LocalPing(const std::string &prefix, parameterlist &params)
+CmdResult CommandPing::Handle(User* user, Params& params)
 {
-	if (params.size() < 1)
-		return true;
-	if (params.size() == 1)
-	{
-		std::string stufftobounce = params[0];
-		this->WriteLine(std::string(":")+ServerInstance->Config->GetSID()+" PONG "+stufftobounce);
-		return true;
-	}
-	else
+	if (params[0] == ServerInstance->Config->GetSID())
 	{
-		std::string forwardto = params[1];
-		if (forwardto == ServerInstance->Config->ServerName || forwardto == ServerInstance->Config->GetSID())
-		{
-			// this is a ping for us, send back PONG to the requesting server
-			params[1] = params[0];
-			params[0] = forwardto;
-			Utils->DoOneToOne(ServerInstance->Config->GetSID(),"PONG",params,params[1]);
-		}
-		else
-		{
-			// not for us, pass it on :)
-			Utils->DoOneToOne(prefix,"PING",params,forwardto);
-		}
-		return true;
+		// PING for us, reply with a PONG
+		CmdBuilder reply("PONG");
+		reply.push(user->uuid);
+		if (params.size() >= 2)
+			// If there is a second parameter, append it
+			reply.push(params[1]);
+
+		reply.Unicast(user);
 	}
+	return CMD_SUCCESS;
 }
-
-