Fix IPv6 cloaking in compatability mode (was using the wrong xtab confusor)

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

diff --git a/src/modules/m_close.cpp b/src/modules/m_close.cpp
index b9ad875877c96aa82a4b7fcc9b7966c9b6df9179..d3d51624fa046173f25e68913d9898c8ccee9c8f 100644 (file)
--- a/src/modules/m_close.cpp
+++ b/src/modules/m_close.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -29,21 +29,22 @@ class CommandClose : public Command
 {
  public:
        /* Command 'close', needs operator */
-       CommandClose (InspIRCd* Instance) : Command(Instance,"CLOSE", "o", 0)
+       CommandClose(Module* Creator) : Command(Creator,"CLOSE", 0)
        {
-               this->source = "m_close.so";
-       }
+       flags_needed = 'o'; }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *src)
        {
                std::map<std::string,int> closed;
 
-               for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+               std::vector<LocalUser*>::reverse_iterator u = ServerInstance->Users->local_users.rbegin();
+               while (u != ServerInstance->Users->local_users.rend())
                {
-                       if ((*u)->registered != REG_ALL)
+                       LocalUser* user = *u++;
+                       if (user->registered != REG_ALL)
                        {
-                               ServerInstance->Users->QuitUser(*u, "Closing all unknown connections per request");
-                               std::string key = ConvToStr((*u)->GetIPString())+"."+ConvToStr((*u)->GetPort());
+                               ServerInstance->Users->QuitUser(user, "Closing all unknown connections per request");
+                               std::string key = ConvToStr(user->GetIPString())+"."+ConvToStr(user->GetServerPort());
                                closed[key]++;
                        }
                }
@@ -51,29 +52,26 @@ class CommandClose : public Command
                int total = 0;
                for (std::map<std::string,int>::iterator ci = closed.begin(); ci != closed.end(); ci++)
                {
-                       user->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",user->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str());
+                       src->WriteServ("NOTICE %s :*** Closed %d unknown connection%s from [%s]",src->nick.c_str(),(*ci).second,((*ci).second>1)?"s":"",(*ci).first.c_str());
                        total += (*ci).second;
                }
                if (total)
-                       user->WriteServ("NOTICE %s :*** %i unknown connection%s closed",user->nick.c_str(),total,(total>1)?"s":"");
+                       src->WriteServ("NOTICE %s :*** %i unknown connection%s closed",src->nick.c_str(),total,(total>1)?"s":"");
                else
-                       user->WriteServ("NOTICE %s :*** No unknown connections found",user->nick.c_str());
+                       src->WriteServ("NOTICE %s :*** No unknown connections found",src->nick.c_str());
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleClose : public Module
 {
-       CommandClose* newcommand;
+       CommandClose cmd;
  public:
-       ModuleClose(InspIRCd* Me)
-               : Module(Me)
+       ModuleClose()
+               : cmd(this)
        {
-               // Create a new command
-               newcommand = new CommandClose(ServerInstance);
-               ServerInstance->AddCommand(newcommand);
-
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleClose()
@@ -82,7 +80,7 @@ class ModuleClose : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+               return Version("Provides /CLOSE functionality", VF_VENDOR);
        }
 };