X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Foverride_stats.cpp;h=9b73837cb3735a81fce6f61048de9a92d4734925;hb=32d96016bd21fd5dff54503df4222c10662e57e5;hp=a1a14a9992a5a3904857f9683f276ce6cd11f34e;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index a1a14a999..9b73837cb 100644
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -1,92 +1,59 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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/>.
  */
 
-/* $ModDesc: Provides a spanning tree server link protocol */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "xline.h"
-#include "transport.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"
-
-/* $ModDep: m_spanningtree/main.h m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/link.h m_spanningtree/treesocket.h */
 
-int ModuleSpanningTree::HandleStats(const std::vector<std::string>& parameters, User* user)
-{
-	if (parameters.size() > 1)
-	{
-		if (InspIRCd::Match(ServerInstance->Config->ServerName, parameters[1]))
-			return 0;
-
-		/* Remote STATS, the server is within the 2nd parameter */
-		std::deque<std::string> params;
-		params.push_back(parameters[0]);
-		params.push_back(parameters[1]);
-		/* Send it out remotely, generate no reply yet */
-
-		TreeServer* s = Utils->FindServerMask(parameters[1]);
-		if (s)
-		{
-			params[1] = s->GetName();
-			Utils->DoOneToOne(user->uuid, "STATS", params, s->GetName());
-		}
-		else
-		{
-			user->WriteServ( "402 %s %s :No such server", user->nick.c_str(), parameters[1].c_str());
-		}
-		return 1;
-	}
-	return 0;
-}
+#include "main.h"
+#include "utils.h"
+#include "link.h"
 
-int ModuleSpanningTree::OnStats(char statschar, User* user, string_list &results)
+ModResult ModuleSpanningTree::OnStats(Stats::Context& stats)
 {
-	if ((statschar == 'c') || (statschar == 'n'))
+	if ((stats.GetSymbol() == 'c') || (stats.GetSymbol() == 'n'))
 	{
-		for (unsigned int i = 0; i < Utils->LinkBlocks.size(); i++)
+		for (std::vector<reference<Link> >::iterator i = Utils->LinkBlocks.begin(); i != Utils->LinkBlocks.end(); ++i)
 		{
-			results.push_back(std::string(ServerInstance->Config->ServerName)+" 213 "+user->nick+" "+statschar+" *@"+(Utils->LinkBlocks[i].HiddenFromStats ? "<hidden>" : Utils->LinkBlocks[i].IPAddr)+" * "+Utils->LinkBlocks[i].Name.c_str()+" "+ConvToStr(Utils->LinkBlocks[i].Port)+" "+(Utils->LinkBlocks[i].Hook.empty() ? "plaintext" : Utils->LinkBlocks[i].Hook)+" "+(Utils->LinkBlocks[i].AutoConnect ? 'a': '-')+'s');
-			if (statschar == 'c')
-				results.push_back(std::string(ServerInstance->Config->ServerName)+" 244 "+user->nick+" H * * "+Utils->LinkBlocks[i].Name.c_str());
+			Link* L = *i;
+			std::string ipaddr = "*@";
+			if (L->HiddenFromStats)
+				ipaddr.append("<hidden>");
+			else
+				ipaddr.append(L->IPAddr);
+
+			const std::string hook = (L->Hook.empty() ? "plaintext" : L->Hook);
+			stats.AddRow(213, stats.GetSymbol(), ipaddr, '*', L->Name, L->Port, hook);
+			if (stats.GetSymbol() == 'c')
+				stats.AddRow(244, 'H', '*', '*', L->Name);
 		}
-		return 1;
+		return MOD_RES_DENY;
 	}
-
-	if (statschar == 'p')
+	else if (stats.GetSymbol() == 'U')
 	{
-		/* show all server ports, after showing client ports. -- w00t */
-
-		for (unsigned int i = 0; i < Utils->Bindings.size(); i++)
+		ConfigTagList tags = ServerInstance->Config->ConfTags("uline");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
-			std::string ip = Utils->Bindings[i]->GetIP();
-			if (ip.empty())
-				ip = "*";
-
-			std::string transport("plaintext");
-			if (Utils->Bindings[i]->GetIOHook())
-				transport = BufferedSocketNameRequest(this, Utils->Bindings[i]->GetIOHook()).Send();
-
-			results.push_back(ConvToStr(ServerInstance->Config->ServerName) + " 249 "+user->nick+" :" + ip + ":" + ConvToStr(Utils->Bindings[i]->GetPort())+
-				" (server, " + transport + ")");
+			std::string name = i->second->getString("server");
+			if (!name.empty())
+				stats.AddRow(248, 'U', name);
 		}
+		return MOD_RES_DENY;
 	}
-	return 0;
+	return MOD_RES_PASSTHRU;
 }
-