X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_clones.cpp;h=3336b18178502ecbc8dffc5cad643b3c5f4d23ad;hb=HEAD;hp=1e5841609fa875f8f9a8c45450aabb8b8120067b;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 1e5841609..3336b1817 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -1,9 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012, 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2007 Craig Edwards <craigedwards@brainbox.cc>
  *
  * 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
@@ -20,70 +24,84 @@
 
 
 #include "inspircd.h"
+#include "modules/ircv3_batch.h"
 
-/* $ModDesc: Provides the /clones command to retrieve information on clones. */
+enum
+{
+	// InspIRCd-specific.
+	RPL_CLONES = 399
+};
 
-/** Handle /CHECK
- */
-class CommandClones : public Command
+class CommandClones : public SplitCommand
 {
+ private:
+	IRCv3::Batch::API batchmanager;
+	IRCv3::Batch::Batch batch;
+
  public:
- 	CommandClones(Module* Creator) : Command(Creator,"CLONES", 1)
+	CommandClones(Module* Creator)
+		: SplitCommand(Creator,"CLONES", 1)
+		, batchmanager(Creator)
+		, batch("inspircd.org/clones")
 	{
-		flags_needed = 'o'; syntax = "<limit>";
+		flags_needed = 'o';
+		syntax = "<limit>";
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
 	{
+		unsigned int limit = ConvToNum<unsigned int>(parameters[0]);
 
-		std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES";
+		// Syntax of a CLONES reply:
+		// :irc.example.com BATCH +<id> inspircd.org/clones :<min-count>
+		// @batch=<id> :irc.example.com 399 <client> <local-count> <remote-count> <cidr-mask>
+		/// :irc.example.com BATCH :-<id>
 
-		unsigned long limit = atoi(parameters[0].c_str());
-
-		/*
-		 * Syntax of a /clones reply:
-		 *  :server.name 304 target :CLONES START
-		 *  :server.name 304 target :CLONES <count> <ip>
-		 *  :server.name 304 target :CHECK END
-		 */
-
-		user->WriteServ(clonesstr + " START");
+		if (batchmanager)
+		{
+			batchmanager->Start(batch);
+			batch.GetBatchStartMessage().PushParam(ConvToStr(limit));
+		}
 
-		/* hostname or other */
-		// XXX I really don't like marking global_clones public for this. at all. -- w00t
-		for (clonemap::iterator x = ServerInstance->Users->global_clones.begin(); x != ServerInstance->Users->global_clones.end(); x++)
+		const UserManager::CloneMap& clonemap = ServerInstance->Users->GetCloneMap();
+		for (UserManager::CloneMap::const_iterator i = clonemap.begin(); i != clonemap.end(); ++i)
 		{
-			if (x->second >= limit)
-				user->WriteServ(clonesstr + " "+ ConvToStr(x->second) + " " + x->first.str());
+			const UserManager::CloneCounts& counts = i->second;
+			if (counts.global < limit)
+				continue;
+
+			Numeric::Numeric numeric(RPL_CLONES);
+			numeric.push(counts.local);
+			numeric.push(counts.global);
+			numeric.push(i->first.str());
+
+			ClientProtocol::Messages::Numeric numericmsg(numeric, user);
+			batch.AddToBatch(numericmsg);
+			user->Send(ServerInstance->GetRFCEvents().numeric, numericmsg);
 		}
 
-		user->WriteServ(clonesstr + " END");
+		if (batchmanager)
+			batchmanager->End(batch);
 
 		return CMD_SUCCESS;
 	}
 };
 
-
 class ModuleClones : public Module
 {
- private:
-	CommandClones cmd;
  public:
-	ModuleClones() : cmd(this)
-	{
-		ServerInstance->AddCommand(&cmd);
-	}
+	CommandClones cmd;
 
-	virtual ~ModuleClones()
+ public:
+	ModuleClones()
+		: cmd(this)
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides the /clones command to retrieve information on clones.", VF_VENDOR);
+		return Version("Adds the /CLONES command which allows server operators to view IP addresses from which there are more than a specified number of connections.", VF_VENDOR);
 	}
-
-
 };
 
 MODULE_INIT(ModuleClones)