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

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

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 72c8a14d3b092e57be60dbdc6d3af781f6b35ef4..be29b00a5db246f2876b19577d847c5119039db9 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,8 +20,9 @@
 class CommandGloadmodule : public Command
 {
  public:
-       CommandGloadmodule (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"GLOADMODULE", "o", 1)
+       CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1)
        {
+               flags_needed = 'o';
                syntax = "<modulename> [servermask]";
                TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
@@ -30,7 +31,7 @@ class CommandGloadmodule : public Command
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
                        if (ServerInstance->Modules->Load(parameters[0].c_str()))
                        {
@@ -47,6 +48,11 @@ class CommandGloadmodule : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handle /GUNLOADMODULE
@@ -54,8 +60,9 @@ class CommandGloadmodule : public Command
 class CommandGunloadmodule : public Command
 {
  public:
-       CommandGunloadmodule (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"GUNLOADMODULE", "o", 1)
+       CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1)
        {
+               flags_needed = 'o';
                syntax = "<modulename> [servermask]";
        }
 
@@ -63,12 +70,14 @@ class CommandGunloadmodule : public Command
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
-                       if (ServerInstance->Modules->Unload(parameters[0].c_str()))
+                       Module* m = ServerInstance->Modules->Find(parameters[0]);
+                       if (m && ServerInstance->Modules->Unload(m))
                        {
                                ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                               user->WriteNumeric(973, "%s %s :Module successfully unloaded.",user->nick.c_str(), parameters[0].c_str());
+                               user->SendText(":%s 973 %s %s :Module successfully unloaded.",
+                                       ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
                        }
                        else
                        {
@@ -80,6 +89,11 @@ class CommandGunloadmodule : public Command
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 /** Handle /GRELOADMODULE
@@ -87,37 +101,36 @@ class CommandGunloadmodule : public Command
 class CommandGreloadmodule : public Command
 {
  public:
-       CommandGreloadmodule (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "GRELOADMODULE", "o", 1)
+       CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1)
        {
-               syntax = "<modulename> [servermask]";
+               flags_needed = 'o'; syntax = "<modulename> [servermask]";
        }
 
        CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
-               if (InspIRCd::Match(ServerInstance->Config->ServerName, servername))
+               if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
-                       bool ok = true;
-                       if (!ServerInstance->Modules->Unload(parameters[0].c_str()))
-                       {
-                               ok = false;
-                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
-                       }
-                       if (!ServerInstance->Modules->Load(parameters[0].c_str()))
+                       Module* m = ServerInstance->Modules->Find(parameters[0]);
+                       if (m)
+                               ServerInstance->Modules->Reload(m, NULL);
+                       else
                        {
-                               ok = false;
-                               user->WriteNumeric(974, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               user->WriteNumeric(975, "%s %s :Could not find module by that name", user->nick.c_str(), parameters[0].c_str());
+                               return CMD_FAILURE;
                        }
-                       ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                       if (ok)
-                               user->WriteNumeric(975, "%s %s :Module successfully loaded.",user->nick.c_str(), parameters[0].c_str());
                }
                else
                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL RELOAD BY '%s' (not reloaded here)",parameters[0].c_str(), user->nick.c_str());
 
                return CMD_SUCCESS;
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class ModuleGlobalLoad : public Module
@@ -127,21 +140,21 @@ class ModuleGlobalLoad : public Module
        CommandGreloadmodule cmd3;
 
  public:
-       ModuleGlobalLoad(InspIRCd* Me)
-               : Module(Me), cmd1(Me, this), cmd2(Me, this), cmd3(Me, this)
+       ModuleGlobalLoad()
+               : cmd1(this), cmd2(this), cmd3(this)
        {
                ServerInstance->AddCommand(&cmd1);
                ServerInstance->AddCommand(&cmd2);
                ServerInstance->AddCommand(&cmd3);
        }
 
-       virtual ~ModuleGlobalLoad()
+       ~ModuleGlobalLoad()
        {
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
        }
 };