X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fctables.h;h=ba6773a4ca9b0fa215d204746eaa616194cede8a;hb=86dd9fa5ea02644096f3529a6cbf3a55b5bb1d60;hp=e8a3337fd2b6e23959ff7988931a7835bd2cd9ac;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/ctables.h b/include/ctables.h index e8a3337fd..ba6773a4c 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -14,23 +14,22 @@ #ifndef __CTABLES_H__ #define __CTABLES_H__ - -#include "inspircd_config.h" -#include "hash_map.h" -#include "base.h" - -/* Forward declarations - required */ -class userrec; -class InspIRCd; - /** Used to indicate command success codes */ enum CmdResult { CMD_FAILURE = 0, /* Command exists, but failed */ CMD_SUCCESS = 1, /* Command exists, and succeeded */ - CMD_INVALID = 2, /* Command doesnt exist at all! */ - CMD_USER_DELETED = 3 /* User was deleted - DEPRECIATED */ + CMD_INVALID = 2 /* Command doesnt exist at all! */ +}; + +enum TranslateType +{ + TR_END, /* End of known parameters, everything after this is TR_TEXT */ + TR_TEXT, /* Raw text, leave as-is */ + TR_NICK, /* Nickname, translate to UUID for server->server */ + TR_NICKLIST, /* Comma seperated nickname list, translate to UUIDs */ + TR_SPACENICKLIST /* Space seperated nickname list, translate to UUIDs */ }; /** For commands which should not be replicated to other @@ -43,9 +42,9 @@ enum CmdResult /** A structure that defines a command. Every command available - * in InspIRCd must be defined as derived from command_t. + * in InspIRCd must be defined as derived from Command. */ -class CoreExport command_t : public Extensible +class CoreExport Command : public Extensible { protected: /** Owner/Creator object @@ -63,10 +62,10 @@ class CoreExport command_t : public Extensible int min_params; /** used by /stats m */ - long use_count; + long double use_count; /** used by /stats m */ - float total_bytes; + long double total_bytes; /** used for resource tracking between modules */ std::string source; @@ -81,22 +80,29 @@ class CoreExport command_t : public Extensible */ std::string syntax; + std::vector translation; + + /** How many seconds worth of penalty does this command have? + */ + const int Penalty; + /** Create a new command. * @param Instance Pointer to creator class * @param cmd Command name. This must be UPPER CASE. - * @param flags User modes required to execute the command. + * @param flags User mode required to execute the command. May ONLY be one mode - it's a string to give warnings if people mix params up. * For oper only commands, set this to 'o', otherwise use 0. * @param minpara Minimum parameters required for the command. * @param before_reg If this is set to true, the command will * be allowed before the user is 'registered' (has sent USER, * NICK, optionally PASS, and been resolved). */ - command_t(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg) + Command(InspIRCd* Instance, const std::string &cmd, const char *flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(flags ? *flags : 0), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty) { use_count = 0; total_bytes = 0; source = ""; syntax = ""; + translation.clear(); } /** Handle the command from a user. @@ -107,7 +113,7 @@ class CoreExport command_t : public Extensible * If the command succeeds but should remain local to this server, * return CMD_LOCALONLY. */ - virtual CmdResult Handle(const char** parameters, int pcnt, userrec* user) = 0; + virtual CmdResult Handle(const char* const* parameters, int pcnt, User* user) = 0; /** Handle an internal request from another command, the core, or a module * @param Command ID @@ -116,7 +122,7 @@ class CoreExport command_t : public Extensible * If the command succeeds but should remain local to this server, * return CMD_LOCALONLY. */ - virtual CmdResult HandleInternal(const unsigned int id, const std::deque ¶ms) + virtual CmdResult HandleInternal(const unsigned int /* id */, const std::deque& /* params */) { return CMD_INVALID; } @@ -130,7 +136,7 @@ class CoreExport command_t : public Extensible * If the command succeeds but should remain local to this server, * return CMD_LOCALONLY. */ - virtual CmdResult HandleServer(const char** parameters, int pcnt, const std::string &servername) + virtual CmdResult HandleServer(const char* const* /* parameters */, int /* pcnt */, const std::string& /* servername */) { return CMD_INVALID; } @@ -161,12 +167,28 @@ class CoreExport command_t : public Extensible /** Standard constructor gubbins */ - virtual ~command_t() {} + virtual ~Command() + { + syntax.clear(); + } }; /** A hash of commands used by the core */ -typedef nspace::hash_map command_table; +typedef nspace::hash_map Commandable; + +#define TRANSLATE1(x1) translation.push_back(x1); +#define TRANSLATE2(x1,x2) translation.push_back(x1);translation.push_back(x2); +#define TRANSLATE3(x1,x2,x3) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3); +#define TRANSLATE4(x1,x2,x3,x4) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4); +#define TRANSLATE5(x1,x2,x3,x4,x5) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\ + translation.push_back(x5); +#define TRANSLATE6(x1,x2,x3,x4,x5,x6) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\ + translation.push_back(x5);translation.push_back(x6); +#define TRANSLATE7(x1,x2,x3,x4,x5,x6,x7) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\ + translation.push_back(x5);translation.push_back(x6);translation.push_back(x7); +#define TRANSLATE8(x1,x2,x3,x4,x5,x6,x7,x8) translation.push_back(x1);translation.push_back(x2);translation.push_back(x3);translation.push_back(x4);\ + translation.push_back(x5);translation.push_back(x6);translation.push_back(x7);translation.push_back(x8); #endif