Rewrite clone counting to use one map instead of two

[user/henk/code/inspircd.git] / src / modules / m_clones.cpp

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 9859073c52130b08ed6e237341896dd23a84d69b..c51c8d3b4f13e7d7427f017d60fb435ac951d557 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -1,124 +1,79 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   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 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 "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "inspircd.h"
-#include "wildcard.h"
 
-/* $ModDesc: Provides the /clones command to retrieve information on a user, channel, or IP address */
+#include "inspircd.h"
 
-/** Handle /CHECK
+/** Handle /CLONES
  */
-class cmd_clones : public command_t
+class CommandClones : public Command
 {
  public:
-       cmd_clones (InspIRCd* Instance) : command_t(Instance,"CLONES", 'o', 1)
+       CommandClones(Module* Creator) : Command(Creator,"CLONES", 1)
        {
-               this->source = "m_clones.so";
-               syntax = "<limit>";
+               flags_needed = 'o'; syntax = "<limit>";
        }
 
-       std::string FindMatchingIP(const irc::string &ipaddr)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               std::string n = assign(ipaddr);
-               for (user_hash::const_iterator a = ServerInstance->clientlist->begin(); a != ServerInstance->clientlist->end(); a++)
-                       if (a->second->GetIPString() == n)
-                               return a->second->GetFullRealHost();
-               return "<?>";
-       }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
-       {
-
-               std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES";
+               std::string clonesstr = "304 " + user->nick + " :CLONES";
 
-               long limit = atoi(parameters[0]);
+               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> <fullhost>
-                *  :server.name 304 target :CHECK END
+                *  :server.name 304 target :CLONES <count> <ip>
+                *  :server.name 304 target :CLONES END
                 */
 
                user->WriteServ(clonesstr + " START");
 
                /* hostname or other */
-               for (clonemap::iterator x = ServerInstance->global_clones.begin(); x != ServerInstance->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) + " " + assign(x->first) + " " + FindMatchingIP(x->first));
+                       const UserManager::CloneCounts& counts = i->second;
+                       if (counts.global >= limit)
+                               user->WriteServ(clonesstr + " " + ConvToStr(counts.global) + " " + i->first.str());
                }
 
                user->WriteServ(clonesstr + " END");
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
-
 class ModuleClones : public Module
 {
- private:
-       cmd_clones *mycommand;
+       CommandClones cmd;
  public:
-       ModuleClones(InspIRCd* Me) : Module::Module(Me)
+       ModuleClones() : cmd(this)
        {
-               
-               mycommand = new cmd_clones(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-       }
-       
-       virtual ~ModuleClones()
-       {
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 
-       void Implements(char* List)
+       Version GetVersion() CXX11_OVERRIDE
        {
-               /* we don't hook anything, nothing required */
+               return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);
        }
-       
 };
 
-
-
-class ModuleClonesFactory : public ModuleFactory
-{
- public:
-       ModuleClonesFactory()
-       {
-       }
-       
-       ~ModuleClonesFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleClones(Me);
-       }
-       
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleClonesFactory;
-}
-
+MODULE_INIT(ModuleClones)