X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=92428fd32b5842f32a3abf48f40edbdc6480c86f;hb=96a4a1d41e42dba806c2e9954e148ed838262511;hp=2c3a482cb019bb6d5c1f077bfa66007735eb2eef;hpb=7775a195d9c417e52eaaf912ec51d62bf0fd9a54;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 2c3a482cb..92428fd32 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,57 +2,50 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "inspircd_config.h" +/* $Core */ + #include "inspircd.h" -#include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "users.h" -#include "globals.h" -#include "modules.h" -#include "dynamic.h" -#include "wildcard.h" -#include "mode.h" -#include "commands.h" #include "xline.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "hashcomp.h" #include "socketengine.h" -#include "userprocess.h" #include "socket.h" -#include "dns.h" -#include "typedefs.h" #include "command_parse.h" -#include "ctables.h" +#include "exitcodes.h" -#define nspace __gnu_cxx +/* Directory Searching for Unix-Only */ +#ifndef WIN32 +#include +#include +#endif -/* Special commands which may occur without registration of the user */ -cmd_user* command_user; -cmd_nick* command_nick; -cmd_pass* command_pass; +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_OnPassCompare,OnPassCompare(ex, data, input, hashtype)) + /* Module matched */ + if (MOD_RESULT == 1) + return 0; + + /* Module explicitly didnt match */ + if (MOD_RESULT == -1) + return 1; + + /* We dont handle any hash types except for plaintext - Thanks tra26 */ + if (hashtype != "" && 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. * There are two overriden versions of this method, one of which takes two potential lists and the other takes one. @@ -64,56 +57,96 @@ cmd_pass* command_pass; * 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(userrec* user, command_t* 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, unsigned int extra) { + if (splithere >= parameters.size()) + return 0; + /* 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::set (thanks for the idea w00t) we can cut this down a ton. + * ...VOOODOOOO! + */ + std::set dupes; + /* Create two lists, one for channel names, one for keys */ irc::commasepstream items1(parameters[splithere]); irc::commasepstream items2(parameters[extra]); - std::string item = ""; + std::string extrastuff; + std::string item; unsigned int max = 0; /* Attempt to iterate these lists and call the command objech * which called us, for every parameter pair until there are * no more left to parse. */ - while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { - std::string extrastuff = items2.GetToken(); - parameters[splithere] = item.c_str(); - parameters[extra] = extrastuff.c_str(); - CommandObj->Handle(parameters,pcnt,user); + if (dupes.find(item.c_str()) == dupes.end()) + { + std::vector new_parameters; + + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); + + if (!items2.GetToken(extrastuff)) + extrastuff = ""; + + new_parameters[splithere] = item.c_str(); + new_parameters[extra] = extrastuff.c_str(); + + CommandObj->Handle(new_parameters, user); + + dupes.insert(item.c_str()); + } } return 1; } -int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& parameters, unsigned int splithere) { + if (splithere >= parameters.size()) + return 0; + /* 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; + std::set dupes; + /* Only one commasepstream here */ irc::commasepstream items1(parameters[splithere]); - std::string item = ""; + std::string item; unsigned int max = 0; /* Parse the commasepstream until there are no tokens remaining. * Each token we parse out, call the command handler that called us * with it */ - while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) + while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets)) { - parameters[splithere] = item.c_str(); - CommandObj->Handle(parameters,pcnt,user); + if (dupes.find(item.c_str()) == dupes.end()) + { + std::vector new_parameters; + + for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) + new_parameters.push_back(parameters[t]); + + new_parameters[splithere] = item.c_str(); + + /* Execute the command handler. */ + CommandObj->Handle(new_parameters, user); + + 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 @@ -122,20 +155,23 @@ int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** p return 1; } -bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user) +bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user) { - nspace::hash_map::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) && (n->second->source != "")) { - if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) + if (user->IsModeSet(n->second->flags_needed)) { - return ((user->HasPermission(commandname)) || (ServerInstance->is_uline(user->server))); + return (user->HasPermission(commandname)); } + } + else + { return true; } } @@ -143,175 +179,298 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use return false; } +Command* CommandParser::GetHandler(const std::string &commandname) +{ + Commandtable::iterator n = cmdlist.find(commandname); + if (n != cmdlist.end()) + return n->second; + + return NULL; +} + // calls a handler function for a command -bool CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user) +CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector& parameters, User *user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + Commandtable::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { - if (pcnt >= n->second->min_params) + if (parameters.size() >= n->second->min_params) { - if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65])) + bool bOkay = false; + + if (IS_LOCAL(user) && n->second->flags_needed) { - if (n->second->flags_needed) - { - if ((user->HasPermission(commandname)) || (!IS_LOCAL(user))) - { - n->second->Handle(parameters,pcnt,user); - return true; - } - } - else + /* if user is local, and flags are needed .. */ + + if (user->IsModeSet(n->second->flags_needed)) { - n->second->Handle(parameters,pcnt,user); - return true; + /* if user has the flags, and now has the permissions, go ahead */ + if (user->HasPermission(commandname)) + bOkay = true; } } + else + { + /* remote or no flags required anyway */ + bOkay = true; + } + + if (bOkay) + { + return n->second->Handle(parameters,user); + } } } - return false; + return CMD_INVALID; +} + +void CommandParser::DoLines(User* current, bool one_only) +{ + while (current->BufferIsReady()) + { + // 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; + } } -void CommandParser::ProcessCommand(userrec *user, std::string &cmd) +bool CommandParser::ProcessCommand(User *user, std::string &cmd) { - const char *command_p[127]; - int items = 0; - std::string para[127]; + std::vector command_p; irc::tokenstream tokens(cmd); - std::string command = tokens.GetToken(); + std::string command, token; + tokens.GetToken(command); - while (((para[items] = tokens.GetToken()) != "") && (items < 127)) - command_p[items] = para[items++].c_str(); + /* A client sent a nick prefix on their command (ick) + * rhapsody and some braindead bouncers do this -- + * the rfc says they shouldnt but also says the ircd should + * discard it if they do. + */ + if (command[0] == ':') + tokens.GetToken(command); + + 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)); - if (MOD_RESULT == 1) { - return; - } - nspace::hash_map::iterator cm = cmdlist.find(command); - - if (cm != cmdlist.end()) + /* find the command, check it exists */ + Commandtable::iterator cm = cmdlist.find(command); + + if (cm == cmdlist.end()) { - if (user) + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); + if (MOD_RESULT == 1) + 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()) { - /* activity resets the ping pending timer */ - user->nping = ServerInstance->Time() + user->pingmax; - 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 privilages",user->nick); - return; - } - 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()); - return; - } - } - if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled())) - { - /* command is disabled! */ - user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str()); - return; - } - if (items < cm->second->min_params) - { - user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str()); - /* If syntax is given, display this as the 461 reply */ - if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length())) - user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str()); - return; - } - if ((user->registered == REG_ALL) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass)) - { - /* ikky /stats counters */ - cm->second->use_count++; - cm->second->total_bytes += cmd.length(); - - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true)); - if (MOD_RESULT == 1) - return; - - /* - * WARNING: nothing may come after the - * command handler call, as the handler - * may free the user structure! - */ - - cm->second->Handle(command_p,items,user); - return; - } - else - { - user->WriteServ("451 %s :You have not registered",command.c_str()); - return; - } + 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; } } - else if (user) + + if (cm->second->max_params && command_p.size() > cm->second->max_params) { - ServerInstance->stats->statsUnknown++; - user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); + /* + * 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(); + + 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); } -} -bool CommandParser::RemoveCommands(const char* source) -{ - bool go_again = true; + /* + * We call OnPreCommand here seperately if the command exists, so the magic above can + * truncate to max_params if necessary. -- w00t + */ + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd)); + if (MOD_RESULT == 1) + return true; - while (go_again) + /* Modify the user's penalty */ + bool do_more = true; + if (!user->HasPrivPermission("users/flood/no-throttle")) { - go_again = false; + user->IncreasePenalty(cm->second->Penalty); + do_more = (user->Penalty < 10); + } - for (nspace::hash_map::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + /* activity resets the ping pending timer */ + if (user->MyClass) + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); + + if (cm->second->flags_needed) + { + if (!user->IsModeSet(cm->second->flags_needed)) { - command_t* x = i->second; - if (x->source == std::string(source)) - { - ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str()); - cmdlist.erase(i); - go_again = true; - break; - } + 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->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str()); + return do_more; } } + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) + { + /* command is disabled! */ + 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()); + } - return true; + ServerInstance->SNO->WriteToSnoMask('d', "%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 (command_p.size() < cm->second->min_params) + { + 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->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str()); + return do_more; + } + if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg())) + { + user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str()); + return do_more; + } + else + { + /* passed all checks.. first, do the (ugly) stats counters. */ + cm->second->use_count++; + cm->second->total_bytes += cmd.length(); + + /* module calls too */ + MOD_RESULT = 0; + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, true, cmd)); + if (MOD_RESULT == 1) + return do_more; + + /* + * WARNING: be careful, the user may be deleted soon + */ + CmdResult result = cm->second->Handle(command_p, user); + + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd)); + return do_more; + } } -void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) +void CommandParser::RemoveCommands(const char* source) +{ + Commandtable::iterator i,safei; + for (i = cmdlist.begin(); i != cmdlist.end();) + { + safei = i; + i++; + RemoveCommand(safei, source); + } +} + +void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source) +{ + Command* x = safei->second; + if (x->source == std::string(source)) + { + cmdlist.erase(safei); + delete x; + } +} + +bool CommandParser::ProcessBuffer(std::string &buffer,User *user) { std::string::size_type a; if (!user) - return; + return true; - while ((a = buffer.find("\n")) != std::string::npos) + while ((a = buffer.rfind("\n")) != std::string::npos) buffer.erase(a); - while ((a = buffer.find("\r")) != std::string::npos) + while ((a = buffer.rfind("\r")) != std::string::npos) buffer.erase(a); if (buffer.length()) { - ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); - this->ProcessCommand(user,buffer); + ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str()); + return this->ProcessCommand(user,buffer); } + + return true; } -bool CommandParser::CreateCommand(command_t *f) +bool CommandParser::CreateCommand(Command *f, void* so_handle) { + if (so_handle) + { + if (RFCCommands.find(f->command) == RFCCommands.end()) + RFCCommands[f->command] = so_handle; + else + { + ServerInstance->Logs->Log("COMMAND",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()) { cmdlist[f->command] = f; - ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); return true; } else return false; @@ -319,73 +478,208 @@ bool CommandParser::CreateCommand(command_t *f) CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) { - this->SetupCommandTable(); + para.resize(128); +} + +bool CommandParser::FindSym(void** v, void* h, const std::string &name) +{ + *v = dlsym(h, "init_command"); + const char* err = dlerror(); + if (err && !(*v)) + { + ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err); + return false; + } + return true; +} + +bool CommandParser::ReloadCommand(std::string cmd, User* user) +{ + char filename[MAXBUF]; + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper); + + SharedObjectList::iterator command = RFCCommands.find(cmd); + + if (command != RFCCommands.end()) + { + Command* cmdptr = cmdlist.find(cmd)->second; + cmdlist.erase(cmdlist.find(cmd)); + + RFCCommands.erase(cmd); + std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower); + delete cmdptr; + dlclose(command->second); + + snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str()); + const char* err = this->LoadCommand(filename); + if (err) + { + if (user) + user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err); + return false; + } + + return true; + } + + return false; +} + +CmdResult CommandReload::Handle(const std::vector& parameters, User *user) +{ + if (parameters.size() < 1) + return CMD_FAILURE; + + user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str()); + if (ServerInstance->Parser->ReloadCommand(parameters[0], user)) + { + user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str()); + return CMD_SUCCESS; + } + else + { + user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str()); + 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->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name); + return NULL; + } + + snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); + h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); + + if (!h) + { + const char* n = dlerror(); + ServerInstance->Logs->Log("COMMAND",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; } +/** This is only invoked on startup + */ void CommandParser::SetupCommandTable() { - /* These three are special (can occur without - * full user registration) and so are saved - * for later use. - */ - command_user = new cmd_user(ServerInstance); - command_nick = new cmd_nick(ServerInstance); - command_pass = new cmd_pass(ServerInstance); - this->CreateCommand(command_user); - this->CreateCommand(command_nick); - this->CreateCommand(command_pass); - - /* The rest of these arent special. boo hoo. - */ - this->CreateCommand(new cmd_quit(ServerInstance)); - this->CreateCommand(new cmd_version(ServerInstance)); - this->CreateCommand(new cmd_ping(ServerInstance)); - this->CreateCommand(new cmd_pong(ServerInstance)); - this->CreateCommand(new cmd_admin(ServerInstance)); - this->CreateCommand(new cmd_privmsg(ServerInstance)); - this->CreateCommand(new cmd_info(ServerInstance)); - this->CreateCommand(new cmd_time(ServerInstance)); - this->CreateCommand(new cmd_whois(ServerInstance)); - this->CreateCommand(new cmd_wallops(ServerInstance)); - this->CreateCommand(new cmd_notice(ServerInstance)); - this->CreateCommand(new cmd_join(ServerInstance)); - this->CreateCommand(new cmd_names(ServerInstance)); - this->CreateCommand(new cmd_part(ServerInstance)); - this->CreateCommand(new cmd_kick(ServerInstance)); - this->CreateCommand(new cmd_mode(ServerInstance)); - this->CreateCommand(new cmd_topic(ServerInstance)); - this->CreateCommand(new cmd_who(ServerInstance)); - this->CreateCommand(new cmd_motd(ServerInstance)); - this->CreateCommand(new cmd_rules(ServerInstance)); - this->CreateCommand(new cmd_oper(ServerInstance)); - this->CreateCommand(new cmd_list(ServerInstance)); - this->CreateCommand(new cmd_die(ServerInstance)); - this->CreateCommand(new cmd_restart(ServerInstance)); - this->CreateCommand(new cmd_kill(ServerInstance)); - this->CreateCommand(new cmd_rehash(ServerInstance)); - this->CreateCommand(new cmd_lusers(ServerInstance)); - this->CreateCommand(new cmd_stats(ServerInstance)); - this->CreateCommand(new cmd_userhost(ServerInstance)); - this->CreateCommand(new cmd_away(ServerInstance)); - this->CreateCommand(new cmd_ison(ServerInstance)); - this->CreateCommand(new cmd_summon(ServerInstance)); - this->CreateCommand(new cmd_users(ServerInstance)); - this->CreateCommand(new cmd_invite(ServerInstance)); - this->CreateCommand(new cmd_trace(ServerInstance)); - this->CreateCommand(new cmd_whowas(ServerInstance)); - this->CreateCommand(new cmd_connect(ServerInstance)); - this->CreateCommand(new cmd_squit(ServerInstance)); - this->CreateCommand(new cmd_modules(ServerInstance)); - this->CreateCommand(new cmd_links(ServerInstance)); - this->CreateCommand(new cmd_map(ServerInstance)); - this->CreateCommand(new cmd_kline(ServerInstance)); - this->CreateCommand(new cmd_gline(ServerInstance)); - this->CreateCommand(new cmd_zline(ServerInstance)); - this->CreateCommand(new cmd_qline(ServerInstance)); - this->CreateCommand(new cmd_eline(ServerInstance)); - this->CreateCommand(new cmd_loadmodule(ServerInstance)); - this->CreateCommand(new cmd_unloadmodule(ServerInstance)); - this->CreateCommand(new cmd_server(ServerInstance)); - this->CreateCommand(new cmd_commands(ServerInstance)); + printf("\nLoading core commands"); + fflush(stdout); + + DIR* library = opendir(LIBRARYDIR); + if (library) + { + dirent* entry = NULL; + while (0 != (entry = readdir(library))) + { + if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map)) + { + printf("."); + fflush(stdout); + + const char* err = this->LoadCommand(entry->d_name); + if (err) + { + printf("Error loading %s: %s", entry->d_name, err); + exit(EXIT_STATUS_BADHANDLER); + } + } + } + closedir(library); + printf("\n"); + } + + if (cmdlist.find("RELOAD") == cmdlist.end()) + this->CreateCommand(new CommandReload(ServerInstance)); } +int CommandParser::TranslateUIDs(const std::deque to, const std::deque &source, std::string &dest) +{ + std::deque::const_iterator items = source.begin(); + std::deque::const_iterator types = to.begin(); + User* user = NULL; + int translations = 0; + dest.clear(); + + while (items != source.end() && types != to.end()) + { + TranslateType t = *types; + std::string item = *items; + types++; + items++; + + switch (t) + { + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(item); + if (user) + { + dest.append(user->uuid); + translations++; + } + else + dest.append(item); + break; + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest.append(item); + break; + } + dest.append(" "); + } + + if (!dest.empty()) + dest.erase(dest.end() - 1); + 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(); + + switch (to) + { + case TR_NICK: + /* Translate single nickname */ + user = ServerInstance->FindNick(source); + if (user) + { + dest = user->uuid; + translations++; + } + else + dest = source; + break; + case TR_END: + case TR_TEXT: + default: + /* Do nothing */ + dest = source; + break; + } + + return translations; +}