X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=bd778c3d2cd6f811af0d75ad698add77f2f3c1a1;hb=db2a4c2c15bb170464bbff464d7cc79cd098df26;hp=3177dc95b0d0a8aaf54b5ccb0a42ee4309f68105;hpb=8cebe2878f3878afce6f643d93668155cb26801d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/include/command_parse.h b/include/command_parse.h index 3177dc95b..bd778c3d2 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -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 @@ -23,13 +23,9 @@ typedef std::map SharedObjectList; * call command handlers by name, and chop up comma seperated * parameters into multiple calls. */ -class CoreExport CommandParser : public classbase +class CoreExport CommandParser { private: - /** The creator of this class - */ - InspIRCd* ServerInstance; - /** Parameter buffer */ std::vector para; @@ -45,30 +41,8 @@ class CoreExport CommandParser : public classbase * @param user The user to parse the command for * @param cmd The command string to process */ - bool ProcessCommand(User *user, std::string &cmd); - - /** Finds the init_command symbol in a .so file - * @param v A function pointer to be initialized - * @param h A valid shared object handle - * @param name The filename being loaded, used for error reporting - * @return True if the symbol could be found - */ - bool FindSym(void** v, void* h, const std::string &name); + bool ProcessCommand(LocalUser *user, std::string &cmd); - /** A list of core-implemented modes and their shared object handles - */ - SharedObjectList RFCCommands; - - /** Load a command from a shared object on disk. - * @param name The shared object to load (without path) - * @return NULL on success, pointer to dlerrr() error message on failure - */ - const char* LoadCommand(const char* name); - - /** Removes a command if the sources match. Used as a helper for - * safe hash_map delete while iter in RemoveCommands(const char* source). - */ - void RemoveCommand(nspace::hash_map::iterator safei, const char* source); public: @@ -76,20 +50,10 @@ class CoreExport CommandParser : public classbase */ Commandtable cmdlist; - /** Reload a core command. - * This will only reload commands implemented by the core, - * to reload a modular command, you must reload that module. - * @param cmd The command to reload. This will cause the shared - * object which implements this command to be closed, and then reloaded. - * @return True if the command was reloaded, false if it could not be found - * or another error occured - */ - bool ReloadCommand(std::string cmd, User* user); - /** Default constructor. * @param Instance The creator of this class */ - CommandParser(InspIRCd* Instance); + CommandParser(); /** Calls the handler for a given command. * @param commandname The command to find. This should be in uppercase. @@ -137,63 +101,27 @@ class CoreExport CommandParser : public classbase * @param The number of items in the parameters list * @param splithere The first parameter index to split as a comma seperated list * @param extra The second parameter index to split as a comma seperated list + * @param usemax Limit the command to MaxTargets targets * @return This function will return 1 when there are no more parameters to process. When this occurs, its * caller should return without doing anything, otherwise it should continue into its main section of code. */ - int LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, unsigned int extra); - - /** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. - * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. - * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once, - * the channel names and their keys as follows: - * - * JOIN #chan1,#chan2,#chan3 key1,,key3 - * - * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating - * two instances of irc::commasepstream and reading them both together until the first runs out of tokens. - * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc. - * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam. - * - * @param user The user who sent the command - * @param CommandObj the command object to call for each parameter in the list - * @param parameters Parameter list as an array of array of char (that's not a typo). - * @param The number of items in the parameters list - * @param splithere The first parameter index to split as a comma seperated list - * @param extra The second parameter index to split as a comma seperated list - * @return This function will return 1 when there are no more parameters to process. When this occurs, its - * caller should return without doing anything, otherwise it should continue into its main section of code. - */ - int LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere); + int LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, int extra = -1, bool usemax = true); /** Take a raw input buffer from a recvq, and process it on behalf of a user. * @param buffer The buffer line to process * @param user The user to whom this line belongs */ - bool ProcessBuffer(std::string &buffer,User *user); - - /** Process lines in a users sendq. - * @param current The user to process - * @param one_only if one_only is set only one command is processed from the sendq. - */ - void DoLines(User* current, bool one_only = false); - - /** Remove all commands relating to module 'source'. - * @param source A module name which has introduced new commands - */ - void RemoveCommands(const char* source); + bool ProcessBuffer(std::string &buffer,LocalUser *user); /** Add a new command to the commands hash * @param f The new Command to add to the list - * @param so_handle The handle to the shared object where the command can be found. - * Only core commands loaded via cmd_*.so files should set this parameter to anything - * meaningful. Module authors should leave this parameter at its default of NULL. * @return True if the command was added */ - bool CreateCommand(Command *f, void* so_handle = NULL); + bool AddCommand(Command *f); - /** Insert the default RFC1459 commands into the command hash. + /** Removes a command. */ - void SetupCommandTable(); + void RemoveCommand(Command* x); /** Translate nicknames in a string into UIDs, based on the TranslationType given. * @param to The translation type to use for the process. @@ -214,20 +142,6 @@ class CoreExport CommandParser : public classbase int TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final = false, Command* custom_translator = NULL); }; -/** Command handler class for the RELOAD command. - * A command cant really reload itself, so this has to be in here. - */ -class CommandReload : public Command -{ - public: - /** Standard constructor - */ - CommandReload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = ""; } - /** Handle RELOAD - */ - CmdResult Handle(const std::vector& parameters, User *user); -}; - /** A lookup table of values for multiplier characters used by * InspIRCd::Duration(). In this lookup table, the indexes for * the ascii values 'm' and 'M' have the value '60', the indexes