Add fine-grained command flood controls

[user/henk/code/inspircd.git] / src / commands / cmd_modules.cpp

diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp
index 36e2e9109f773491b2bbfce04c24bf9587f90343..64ff81b812f1de883d45172ac2f7f7af057f8e02 100644 (file)
--- a/src/commands/cmd_modules.cpp
+++ b/src/commands/cmd_modules.cpp
@@ -12,12 +12,32 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_modules.h"
 
-extern "C" DllExport Command* init_command(InspIRCd* Instance)
+/** Handle /MODULES. These command handlers can be reloaded by the core,
+ * and handle basic RFC1459 commands. Commands within modules work
+ * the same way, however, they can be fully unloaded, where these
+ * may not.
+ */
+class CommandModules : public Command
 {
-       return new CommandModules(Instance);
-}
+ public:
+       /** Constructor for modules.
+        */
+       CommandModules ( Module* parent) : Command(parent,"MODULES",0,0) { syntax = "[server]"; }
+       /** Handle command.
+        * @param parameters The parameters to the comamnd
+        * @param pcnt The number of parameters passed to teh command
+        * @param user The user issuing the command
+        * @return A value from CmdResult to indicate command success or failure.
+        */
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               if (parameters.size() >= 1)
+                       return ROUTE_UNICAST(parameters[0]);
+               return ROUTE_LOCALONLY;
+       }
+};
 
 /** Handle /MODULES
  */
@@ -32,20 +52,24 @@ CmdResult CommandModules::Handle (const std::vector<std::string>&, User *user)
 
                if (user->HasPrivPermission("servers/auspex"))
                {
-                       std::string flags("Svsc");
+                       std::string flags("SvcC");
                        int pos = 0;
-                       for (int mult = 1; mult <= VF_SERVICEPROVIDER; mult *= 2, ++pos)
+                       for (int mult = 1; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
                                if (!(V.Flags & mult))
                                        flags[pos] = '-';
 
-                       user->WriteNumeric(702, "%s :0x%08lx %s %s :%s", user->nick.c_str(), (unsigned long)m, module_names[i].c_str(), flags.c_str(), V.version.c_str());
+                       user->SendText(":%s 702 %s :%p %s %s :%s - %s", ServerInstance->Config->ServerName.c_str(),
+                               user->nick.c_str(), (void*)m, module_names[i].c_str(), flags.c_str(), V.description.c_str(), V.version.c_str());
                }
                else
                {
-                       user->WriteNumeric(702, "%s :%s",user->nick.c_str(), module_names[i].c_str());
+                       user->SendText(":%s 702 %s :%s %s", ServerInstance->Config->ServerName.c_str(),
+                               user->nick.c_str(), module_names[i].c_str(), V.description.c_str());
                }
        }
-       user->WriteNumeric(703, "%s :End of MODULES list",user->nick.c_str());
+       user->SendText(":%s 703 %s :End of MODULES list", ServerInstance->Config->ServerName.c_str(), user->nick.c_str());
 
        return CMD_SUCCESS;
 }
+
+COMMAND_INIT(CommandModules)