X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=76dfc06ce05eabf887794b76981ef8410c36f992;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=d82f523dbf7b7918d8bb5658df59931b34745cb3;hpb=130f5c44d723db841444c9becd71464b81145c3d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index d82f523db..76dfc06ce 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,41 +1,47 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2006-2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core: libIRCDcommand_parse */ #include "inspircd.h" -#include "wildcard.h" -#include "xline.h" -#include "socketengine.h" -#include "socket.h" -#include "command_parse.h" -#include "exitcodes.h" - -/* Directory Searching for Unix-Only */ -#ifndef WIN32 -#include -#include -#endif - -int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) + +int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { - int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) - if (MOD_RESULT == 1) + ModResult res; + FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype)); + + /* Module matched */ + if (res == MOD_RES_ALLOW) return 0; - if (MOD_RESULT == -1) + + /* Module explicitly didnt match */ + if (res == MOD_RES_DENY) return 1; - return strcmp(data,input); + + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (!hashtype.empty() && hashtype != "plaintext") + /* See below. 1 because they dont match */ + return 1; + + return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else } /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list. @@ -48,24 +54,30 @@ int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) * 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. */ -int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere, int extra, bool usemax) { + if (splithere >= parameters.size()) + return 0; + + if (extra >= (signed)parameters.size()) + extra = -1; + /* First check if we have more than one item in the list, if we don't we return zero here and the handler * which called us just carries on as it was. */ - if (!strchr(parameters[splithere],',')) + if (parameters[splithere].find(',') == std::string::npos) return 0; /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm. - * By using std::map (thanks for the idea w00t) we can cut this down a ton. + * By using std::set (thanks for the idea w00t) we can cut this down a ton. * ...VOOODOOOO! */ - std::map dupes; + std::set dupes; /* Create two lists, one for channel names, one for keys */ irc::commasepstream items1(parameters[splithere]); - irc::commasepstream items2(parameters[extra]); + irc::commasepstream items2(extra >= 0 ? parameters[extra] : ""); std::string extrastuff; std::string item; unsigned int max = 0; @@ -74,84 +86,34 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parame * which called us, for every parameter pair until there are * no more left to parse. */ - while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets)) { if (dupes.find(item.c_str()) == dupes.end()) { - const char* new_parameters[MAXPARAMETERS]; - - for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) - new_parameters[t] = parameters[t]; + std::vector new_parameters(parameters); if (!items2.GetToken(extrastuff)) - extrastuff = ""; - - new_parameters[splithere] = item.c_str(); - new_parameters[extra] = extrastuff.c_str(); - - CommandObj->Handle(new_parameters,pcnt,user); - - dupes[item.c_str()] = true; - } - } - return 1; -} - -int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere) -{ - /* First check if we have more than one item in the list, if we don't we return zero here and the handler - * which called us just carries on as it was. - */ - if (!strchr(parameters[splithere],',')) - return 0; - - std::map dupes; - - /* Only one commasepstream here */ - irc::commasepstream items1(parameters[splithere]); - std::string item; - unsigned int max = 0; + extrastuff.clear(); - /* Parse the commasepstream until there are no tokens remaining. - * Each token we parse out, call the command handler that called us - * with it - */ - while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) - { - if (dupes.find(item.c_str()) == dupes.end()) - { - const char* new_parameters[MAXPARAMETERS]; + new_parameters[splithere] = item; + if (extra >= 0) + new_parameters[extra] = extrastuff; - for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++) - new_parameters[t] = parameters[t]; + CommandObj->Handle(new_parameters, user); - new_parameters[splithere] = item.c_str(); - - parameters[splithere] = item.c_str(); - - /* Execute the command handler over and over. If someone pulls our user - * record out from under us (e.g. if we /kill a comma sep list, and we're - * in that list ourselves) abort if we're gone. - */ - CommandObj->Handle(new_parameters,pcnt,user); - - dupes[item.c_str()] = true; + dupes.insert(item.c_str()); } } - /* By returning 1 we tell our caller that nothing is to be done, - * as all the previous calls handled the data. This makes the parent - * return without doing any processing. - */ return 1; } -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user) +bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if ((pcnt>=n->second->min_params) && (n->second->source != "")) + if ((pcnt >= n->second->min_params)) { if (IS_LOCAL(user) && n->second->flags_needed) { @@ -171,7 +133,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, Use Command* CommandParser::GetHandler(const std::string &commandname) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) return n->second; @@ -180,13 +142,16 @@ Command* CommandParser::GetHandler(const std::string &commandname) // calls a handler function for a command -CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user) +CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector& parameters, User *user) { - Commandable::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if (pcnt >= n->second->min_params) + if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param)) + return CMD_INVALID; + + if (parameters.size() >= n->second->min_params) { bool bOkay = false; @@ -209,60 +174,18 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char** if (bOkay) { - return n->second->Handle(parameters,pcnt,user); + return n->second->Handle(parameters,user); } } } return CMD_INVALID; } -void CommandParser::DoLines(User* current, bool one_only) -{ - // while there are complete lines to process... - unsigned int floodlines = 0; - - while (current->BufferIsReady()) - { - if (current->MyClass) - { - if (ServerInstance->Time() > current->reset_due) - { - current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold(); - current->lines_in = 0; - } - - if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood()) - { - ServerInstance->FloodQuitUser(current); - return; - } - - if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0)) - { - ServerInstance->FloodQuitUser(current); - return; - } - } - - // use GetBuffer to copy single lines into the sanitized string - std::string single_line = current->GetBuffer(); - current->bytes_in += single_line.length(); - current->cmds_in++; - if (single_line.length() > MAXBUF - 2) // MAXBUF is 514 to allow for neccessary line terminators - single_line.resize(MAXBUF - 2); // So to trim to 512 here, we use MAXBUF - 2 - - // ProcessBuffer returns false if the user has gone over penalty - if (!ServerInstance->Parser->ProcessBuffer(single_line, current) || one_only) - break; - } -} - -bool CommandParser::ProcessCommand(User *user, std::string &cmd) +bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd) { - const char *command_p[MAXPARAMETERS]; - int items = 0; + std::vector command_p; irc::tokenstream tokens(cmd); - std::string command; + std::string command, token; tokens.GetToken(command); /* A client sent a nick prefix on their command (ick) @@ -270,81 +193,159 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) * the rfc says they shouldnt but also says the ircd should * discard it if they do. */ - if (*command.c_str() == ':') + if (command[0] == ':') tokens.GetToken(command); - while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS)) - { - command_p[items] = para[items].c_str(); - items++; - } + while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS)) + command_p.push_back(token); std::transform(command.begin(), command.end(), command.begin(), ::toupper); - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd)); - if (MOD_RESULT == 1) { - return true; - } /* find the command, check it exists */ - Commandable::iterator cm = cmdlist.find(command); - + Commandtable::iterator cm = cmdlist.find(command); + + // Penalty to give if the command fails before the handler is executed + unsigned int failpenalty = 0; + + /* Modify the user's penalty regardless of whether or not the command exists */ + bool do_more = true; + if (!user->HasPrivPermission("users/flood/no-throttle")) + { + // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap + unsigned int penalty = (cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000); + user->CommandFloodPenalty += penalty; + + // Increase their penalty later if we fail and the command has 0 penalty by default (i.e. in Command::Penalty) to + // throttle sending ERR_* from the command parser. If the command does have a non-zero penalty then this is not + // needed because we've increased their penalty above. + if (penalty == 0) + failpenalty = 1000; + } + + if (cm == cmdlist.end()) { - if (user->registered == REG_ALL) + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return true; + + /* + * This double lookup is in case a module (abbreviation) wishes to change a command. + * Sure, the double lookup is a bit painful, but bear in mind this only happens for unknowns anyway. + * + * Thanks dz for making me actually understand why this is necessary! + * -- w00t + */ + cm = cmdlist.find(command); + if (cm == cmdlist.end()) { - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); + if (user->registered == REG_ALL) + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + ServerInstance->stats->statsUnknown++; + return true; } - ServerInstance->stats->statsUnknown++; - return true; } - /* Modify the user's penalty */ - bool do_more = true; - if (!user->ExemptFromPenalty) + if (cm->second->max_params && command_p.size() > cm->second->max_params) { - user->IncreasePenalty(cm->second->Penalty); - do_more = (user->Penalty < 10); - if (!do_more) - user->OverPenalty = true; + /* + * command_p input (assuming max_params 1): + * this + * is + * a + * test + */ + std::string lparam; + + /* + * The '-1' here is a clever trick, we'll go backwards throwing everything into a temporary param + * and then just toss that into the array. + * -- w00t + */ + while (command_p.size() > (cm->second->max_params - 1)) + { + // BE CAREFUL: .end() returns past the end of the vector, hence decrement. + std::vector::iterator it = command_p.end() - 1; + + lparam.insert(0, " " + *(it)); + command_p.erase(it); // remove last element + } + + /* we now have (each iteration): + * ' test' + * ' a test' + * ' is a test' <-- final string + * ...now remove the ' ' at the start... + */ + lparam.erase(lparam.begin()); + + /* param is now 'is a test', which is exactly what we wanted! */ + command_p.push_back(lparam); } + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd)); + if (MOD_RESULT == MOD_RES_DENY) + return true; + /* activity resets the ping pending timer */ - if (user->MyClass) - user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); if (cm->second->flags_needed) { if (!user->IsModeSet(cm->second->flags_needed)) { - user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick); + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str()); return do_more; } if (!user->HasPermission(command)) { - user->WriteServ("481 %s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str()); + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s", + user->nick.c_str(), user->oper->NameStr(), command.c_str()); return do_more; } } if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { /* command is disabled! */ - user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); - ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)", - command.c_str(), user->nick, user->ident, user->host); + user->CommandFloodPenalty += failpenalty; + if (ServerInstance->Config->DisabledDontExist) + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str()); + } + else + { + user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :This command has been disabled.", + user->nick.c_str(), command.c_str()); + } + + ServerInstance->SNO->WriteToSnoMask('a', "%s denied for %s (%s@%s)", + command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str()); return do_more; } - if (items < cm->second->min_params) + + if ((!command_p.empty()) && (command_p.back().empty()) && (!cm->second->allow_empty_last_param)) + command_p.pop_back(); + + if (command_p.size() < cm->second->min_params) { - user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str()); + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str()); if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length())) - user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str()); + user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->name.c_str(), cm->second->syntax.c_str()); return do_more; } if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) { - user->WriteServ("451 %s :You have not registered",command.c_str()); + user->CommandFloodPenalty += failpenalty; + user->WriteNumeric(ERR_NOTREGISTERED, "%s %s :You have not registered", user->nick.c_str(), command.c_str()); return do_more; } else @@ -354,252 +355,116 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) cm->second->total_bytes += cmd.length(); /* module calls too */ - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); - if (MOD_RESULT == 1) + FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd)); + if (MOD_RESULT == MOD_RES_DENY) return do_more; /* * WARNING: be careful, the user may be deleted soon */ - CmdResult result = cm->second->Handle(command_p,items,user); + CmdResult result = cm->second->Handle(command_p, user); - FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd)); return do_more; } } -bool CommandParser::RemoveCommands(const char* source) +void CommandParser::RemoveCommand(Command* x) { - Commandable::iterator i,safei; - for (i = cmdlist.begin(); i != cmdlist.end(); i++) - { - safei = i; - safei++; - if (safei != cmdlist.end()) - { - RemoveCommand(safei, source); - } - } - safei = cmdlist.begin(); - if (safei != cmdlist.end()) - { - RemoveCommand(safei, source); - } - return true; + Commandtable::iterator n = cmdlist.find(x->name); + if (n != cmdlist.end() && n->second == x) + cmdlist.erase(n); } -void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source) +Command::~Command() { - Command* x = safei->second; - if (x->source == std::string(source)) - { - cmdlist.erase(safei); - delete x; - } + ServerInstance->Parser->RemoveCommand(this); } -bool CommandParser::ProcessBuffer(std::string &buffer,User *user) +bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user) { - std::string::size_type a; - - if (!user) + if (!user || buffer.empty()) return true; - while ((a = buffer.rfind("\n")) != std::string::npos) - buffer.erase(a); - while ((a = buffer.rfind("\r")) != std::string::npos) - buffer.erase(a); - - if (buffer.length()) - { - if (!user->muted) - { - ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str()); - return this->ProcessCommand(user,buffer); - } - } - return true; + ServerInstance->Logs->Log("USERINPUT", RAWIO, "C[%s] I :%s %s", + user->uuid.c_str(), user->nick.c_str(), buffer.c_str()); + return ProcessCommand(user,buffer); } -bool CommandParser::CreateCommand(Command *f, void* so_handle) +bool CommandParser::AddCommand(Command *f) { - if (so_handle) - { - if (RFCCommands.find(f->command) == RFCCommands.end()) - RFCCommands[f->command] = so_handle; - else - { - ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded."); - return false; - } - } - /* create the command and push it onto the table */ - if (cmdlist.find(f->command) == cmdlist.end()) + if (cmdlist.find(f->name) == cmdlist.end()) { - cmdlist[f->command] = f; + cmdlist[f->name] = f; return true; } - else return false; -} - -CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) -{ - para.resize(128); + return false; } -bool CommandParser::FindSym(void** v, void* h, const std::string &name) +CommandParser::CommandParser() { - *v = dlsym(h, "init_command"); - const char* err = dlerror(); - if (err && !(*v)) - { - ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); - return false; - } - return true; } -bool CommandParser::ReloadCommand(const char* cmd, User* user) +int CommandParser::TranslateUIDs(const std::vector to, const std::vector &source, std::string &dest, bool prefix_final, Command* custom_translator) { - char filename[MAXBUF]; - char commandname[MAXBUF]; - int y = 0; - - for (const char* x = cmd; *x; x++, y++) - commandname[y] = toupper(*x); - - commandname[y] = 0; - - SharedObjectList::iterator command = RFCCommands.find(commandname); + std::vector::const_iterator types = to.begin(); + User* user = NULL; + unsigned int i; + int translations = 0; + dest.clear(); - if (command != RFCCommands.end()) + for(i=0; i < source.size(); i++) { - Command* cmdptr = cmdlist.find(commandname)->second; - cmdlist.erase(cmdlist.find(commandname)); - - for (char* x = commandname; *x; x++) - *x = tolower(*x); - - - delete cmdptr; - dlclose(command->second); - RFCCommands.erase(command); + TranslateType t; + std::string item = source[i]; - snprintf(filename, MAXBUF, "cmd_%s.so", commandname); - const char* err = this->LoadCommand(filename); - if (err) + if (types == to.end()) + t = TR_TEXT; + else { - if (user) - user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd, err); - return false; + t = *types; + types++; } - return true; - } - - return false; -} - -CmdResult cmd_reload::Handle(const char** parameters, int /* pcnt */, User *user) -{ - user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); - if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) - { - user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]); - ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]); - return CMD_SUCCESS; - } - else - { - user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0]); - return CMD_FAILURE; - } -} - -const char* CommandParser::LoadCommand(const char* name) -{ - char filename[MAXBUF]; - void* h; - Command* (*cmd_factory_func)(InspIRCd*); - - /* Command already exists? Succeed silently - this is needed for REHASH */ - if (RFCCommands.find(name) != RFCCommands.end()) - { - ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); - return NULL; - } + if (prefix_final && i == source.size() - 1) + dest.append(":"); - snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); - h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); - - if (!h) - { - const char* n = dlerror(); - ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n); - return n; - } - - if (this->FindSym((void **)&cmd_factory_func, h, name)) - { - Command* newcommand = cmd_factory_func(ServerInstance); - this->CreateCommand(newcommand, h); - } - return NULL; -} - -void CommandParser::SetupCommandTable(User* user) -{ - RFCCommands.clear(); - - if (!user) - { - printf("\nLoading core commands"); - fflush(stdout); - } - - DIR* library = opendir(LIBRARYDIR); - if (library) - { - dirent* entry = NULL; - while ((entry = readdir(library))) + switch (t) { - if (match(entry->d_name, "cmd_*.so")) - { - if (!user) - { - printf("."); - fflush(stdout); - } - const char* err = this->LoadCommand(entry->d_name); - if (err) + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(item); + if (user) { - if (user) - { - user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick, entry->d_name, err); - } - else - { - printf("Error loading %s: %s", entry->d_name, err); - exit(EXIT_STATUS_BADHANDLER); - } + dest.append(user->uuid); + translations++; } - } + else + dest.append(item); + break; + case TR_CUSTOM: + if (custom_translator) + custom_translator->EncodeParameter(item, i); + dest.append(item); + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest.append(item); + break; } - closedir(library); - if (!user) - printf("\n"); + if (i != source.size() - 1) + dest.append(" "); } - if (cmdlist.find("RELOAD") == cmdlist.end()) - this->CreateCommand(new cmd_reload(ServerInstance)); + return translations; } int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest) { User* user = NULL; - std::string item; int translations = 0; dest.clear(); @@ -616,46 +481,6 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st else dest = source; break; - case TR_NICKLIST: - { - /* Translate comma seperated list of nicknames */ - irc::commasepstream items(source); - while (items.GetToken(item)) - { - user = ServerInstance->FindNick(item); - if (user) - { - dest.append(user->uuid); - translations++; - } - else - dest.append(item); - dest.append(","); - } - if (!dest.empty()) - dest.erase(dest.end() - 1); - } - break; - case TR_SPACENICKLIST: - { - /* Translate space seperated list of nicknames */ - irc::spacesepstream items(source); - while (items.GetToken(item)) - { - user = ServerInstance->FindNick(item); - if (user) - { - dest.append(user->uuid); - translations++; - } - else - dest.append(item); - dest.append(" "); - } - if (!dest.empty()) - dest.erase(dest.end() - 1); - } - break; case TR_END: case TR_TEXT: default: @@ -666,4 +491,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st return translations; } -