X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fping.cpp;h=92eee2666b68c1863dfd297e497fce785e51eb94;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=df708026ea38338e25a8837753faa26c2b95f0dd;hpb=a3f89e772514aca9aa4615ebe1656010111fc455;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ping.cpp b/src/modules/m_spanningtree/ping.cpp
index df708026e..92eee2666 100644
--- a/src/modules/m_spanningtree/ping.cpp
+++ b/src/modules/m_spanningtree/ping.cpp
@@ -1,62 +1,49 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "transport.h"
-#include "socketengine.h"
-
-#include "m_spanningtree/main.h"
-#include "m_spanningtree/utils.h"
-#include "m_spanningtree/treeserver.h"
-#include "m_spanningtree/link.h"
-#include "m_spanningtree/treesocket.h"
-#include "m_spanningtree/resolvers.h"
-#include "m_spanningtree/handshaketimer.h"
-
-/* $ModDep: m_spanningtree/timesynctimer.h m_spanningtree/resolvers.h m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
-
-bool TreeSocket::LocalPing(const std::string &prefix, std::deque<std::string> &params)
+
+#include "utils.h"
+#include "treesocket.h"
+
+bool TreeSocket::LocalPing(const std::string &prefix, parameterlist &params)
 {
 	if (params.size() < 1)
 		return true;
-	if (params.size() == 1)
+
+	const std::string& forwardto = params[0];
+	if (forwardto == ServerInstance->Config->GetSID())
 	{
-		std::string stufftobounce = params[0];
-		this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" PONG "+stufftobounce);
-		return true;
+		// PING for us, reply with a PONG
+		std::string reply = ":" + forwardto + " PONG " + prefix;
+		if (params.size() >= 2)
+			// If there is a second parameter, append it
+			reply.append(" :").append(params[1]);
+
+		this->WriteLine(reply);
 	}
 	else
 	{
-		std::string forwardto = params[1];
-		if (forwardto == this->Instance->Config->ServerName || forwardto == this->Instance->Config->GetSID())
-		{
-			// this is a ping for us, send back PONG to the requesting server
-			params[1] = params[0];
-			params[0] = forwardto;
-			Utils->DoOneToOne(forwardto,"PONG",params,params[1]);
-		}
-		else
-		{
-			// not for us, pass it on :)
-			Utils->DoOneToOne(prefix,"PING",params,forwardto);
-		}
-		return true;
+		// not for us, pass it on :)
+		Utils->DoOneToOne(prefix,"PING",params,forwardto);
 	}
+	return true;
 }