X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fctables.h;h=37ed92ce0dac923b83ee2c24f217d76b1e8a0d27;hb=2be4fff3e371b8add4fa6f471414e1f88418875f;hp=d6331647554b48587c8c3d3b11a9360d0708c92d;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/ctables.h b/include/ctables.h index d63316475..37ed92ce0 100644 --- a/include/ctables.h +++ b/include/ctables.h @@ -14,32 +14,28 @@ #ifndef __CTABLES_H__ #define __CTABLES_H__ - -#include "inspircd_config.h" -#include "hash_map.h" -#include "base.h" - -/* Forward declarations - required */ -class User; -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! */ }; +/** Translation types for translation of parameters to UIDs. + * This allows the core commands to not have to be aware of how UIDs + * work (making it still possible to write other linking modules which + * do not use UID (but why would you want to?) + */ 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 */ + TR_SPACENICKLIST, /* Space seperated nickname list, translate to UUIDs */ + TR_CUSTOM /* Custom translation handled by EncodeParameter/DecodeParameter */ }; /** For commands which should not be replicated to other @@ -69,7 +65,7 @@ class CoreExport Command : public Extensible char flags_needed; /** Minimum number of parameters command takes */ - int min_params; + unsigned int min_params; /** used by /stats m */ long double use_count; @@ -90,6 +86,9 @@ class CoreExport Command : public Extensible */ std::string syntax; + /** Translation type list for possible parameters, used to tokenize + * parameters into UIDs and SIDs etc. + */ std::vector translation; /** How many seconds worth of penalty does this command have? @@ -99,14 +98,14 @@ class CoreExport Command : public Extensible /** 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(InspIRCd* Instance, const std::string &cmd, char flags, int minpara, int before_reg = false, int penalty = 1) : ServerInstance(Instance), command(cmd), flags_needed(flags), min_params(minpara), disabled(false), works_before_reg(before_reg), Penalty(penalty) + 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; @@ -117,13 +116,12 @@ class CoreExport Command : public Extensible /** Handle the command from a user. * @param parameters The parameters for the command. - * @param pcnt The number of parameters available in 'parameters' * @param user The user who issued the command. * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure. * If the command succeeds but should remain local to this server, * return CMD_LOCALONLY. */ - virtual CmdResult Handle(const char** parameters, int pcnt, User* user) = 0; + virtual CmdResult Handle(const std::vector& parameters, User* user) = 0; /** Handle an internal request from another command, the core, or a module * @param Command ID @@ -140,17 +138,35 @@ class CoreExport Command : public Extensible /** Handle the command from a server. * Not currently used in this version of InspIRCd. * @param parameters The parameters given - * @param pcnt The number of parameters available * @param servername The server name which issued the command * @return Return CMD_SUCCESS on success, or CMD_FAILURE on failure. * 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 std::vector& /* parameters */, const std::string& /* servername */) { return CMD_INVALID; } + /** Encode a parameter for server->server transmission. + * Used for parameters for which the translation type is TR_CUSTOM. + * @param parameter The parameter to encode. Can be modified in place. + * @param index The parameter index (0 == first parameter). + */ + virtual void EncodeParameter(std::string& parameter, int index) + { + } + + /** Decode a parameter from server->server transmission. + * Not currently used in this version of InspIRCd. + * Used for parameters for which the translation type is TR_CUSTOM. + * @param parameter The parameter to decode. Can be modified in place. + * @param index The parameter index (0 == first parameter). + */ + virtual void DecodeParameter(std::string& parameter, int index) + { + } + /** Disable or enable this command. * @param setting True to disable the command. */ @@ -177,13 +193,18 @@ class CoreExport Command : public Extensible /** Standard constructor gubbins */ - virtual ~Command() {} + virtual ~Command() + { + syntax.clear(); + } }; /** A hash of commands used by the core */ -typedef nspace::hash_map Commandable; +typedef nspace::hash_map Commandtable; +/** Shortcut macros for defining translation lists + */ #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);