X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=ab935559d9be0374bc972ad0e9a017eae8ff45ba;hb=234c7cd851229d94eb8c26a8a68ca6967f20aff8;hp=f27467f34877a645510601aec8c66183e120bfc2;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index f27467f34..ab935559d 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,301 +1,234 @@ -/* +------------------------------------+ + /* +------------------------------------+ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 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. * * --------------------------------------------------- */ -#include "inspircd_config.h" #include "inspircd.h" #include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef THREADED_DNS -#include -#endif +#include #include "users.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" #include "wildcard.h" -#include "message.h" -#include "mode.h" -#include "commands.h" #include "xline.h" -#include "inspstring.h" -#include "dnsqueue.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" - -#define nspace __gnu_cxx - -extern InspIRCd* ServerInstance; - -extern std::vector modules; -extern std::vector factory; -extern std::vector module_sockets; -extern std::vector local_users; -extern int MODCOUNT; -extern InspSocket* socket_ref[MAX_DESCRIPTORS]; -extern time_t TIME; +/* Directory Searching for Unix-Only */ +#ifndef WIN32 +#include +#include +#endif -// This table references users by file descriptor. -// its an array to make it VERY fast, as all lookups are referenced -// by an integer, meaning there is no need for a scan/search operation. -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; +bool InspIRCd::ULine(const char* server) +{ + if (!server) + return false; + if (!*server) + return true; -extern Server* MyServer; -extern ServerConfig *Config; + return (Config->ulines.find(server) != Config->ulines.end()); +} -extern user_hash clientlist; -extern chan_hash chanlist; +bool InspIRCd::SilentULine(const char* server) +{ + std::map::iterator n = Config->ulines.find(server); + if (n != Config->ulines.end()) + return n->second; + else return false; +} -/* Special commands which may occur without registration of the user */ -cmd_user* command_user; -cmd_nick* command_nick; -cmd_pass* command_pass; +int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber) +{ + int MOD_RESULT = 0; + FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber)) + if (MOD_RESULT == 1) + return 0; + if (MOD_RESULT == -1) + return 1; + return strcmp(data,input); +} -/* This function pokes and hacks at a parameter list like the following: - * - * PART #winbot,#darkgalaxy :m00! - * - * to turn it into a series of individual calls like this: - * - * PART #winbot :m00! - * PART #darkgalaxy :m00! - * - * The seperate calls are sent to a callback function provided by the caller - * (the caller will usually call itself recursively). The callback function - * must be a command handler. Calling this function on a line with no list causes - * no action to be taken. You must provide a starting and ending parameter number - * where the range of the list can be found, useful if you have a terminating - * parameter as above which is actually not part of the list, or parameters - * before the actual list as well. This code is used by many functions which - * can function as "one to list" (see the RFC) */ - -int CommandParser::LoopCall(command_t* fn, const char** parameters, int pcnt, userrec *u, int start, int end, int joins) +std::string InspIRCd::TimeString(time_t curtime) { - /* Copy of the parameter list, because like strltok, we make a bit of - * a mess of the parameter string we're given, and we want to keep this - * private. - */ - char paramlist[MAXBUF]; - /* Temporary variable used to hold one split parameter - */ - char *param; - /* Parameter list, we can have up to 32 of these - */ - const char *pars[32]; - /* Seperated items, e.g. holds the #one and #two from "#one,#two" - */ - const char *sep_items[32]; - /* Seperated keys, holds the 'two' and 'three' of "two,three" - */ - const char *sep_keys[32]; - /* Misc. counters, the total values hold the total number of - * seperated items in sep_items (total) and the total number of - * seperated items in sep_keys (total2) - */ - int j = 0, q = 0, total = 0, total2 = 0; - /* A temporary copy of the comma seperated key list (see the description - * of the paramlist variable) - */ - char keylist[MAXBUF]; - /* Exactly what it says. Its nothing. We point invalid parameters at this. - */ - char nothing = 0; + return std::string(ctime(&curtime),24); +} - /* First, initialize our arrays */ - for (int i = 0; i < 32; i++) - sep_items[i] = sep_keys[i] = NULL; +long InspIRCd::Duration(const char* str) +{ + char n_field[MAXBUF]; + long total = 0; + n_field[0] = 0; - /* Now find all parameters that are NULL, maybe above pcnt, - * and for safety, point them at 'nothing' - */ - for (int i = 0; i < 10; i++) + if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y'))) { - if (!parameters[i]) - { - parameters[i] = ¬hing; - } + std::string n = str; + n += 's'; + return Duration(n.c_str()); } - /* Check if we're doing JOIN handling. JOIN has two lists in - * it, potentially, if we have keys, so this is a special-case - * to handle the keys if they are provided. - */ - if (joins) + + for (char* i = (char*)str; *i; i++) { - if (pcnt > 1) /* we have a key to copy */ + // if we have digits, build up a string for the value in n_field, + // up to 10 digits in size. + if ((*i >= '0') && (*i <= '9')) { - strlcpy(keylist,parameters[1],MAXBUF); + strlcat(n_field,i,10); } - } + else + { + // we dont have a digit, check for numeric tokens + switch (tolower(*i)) + { + case 's': + total += atoi(n_field); + break; - /* There's nothing to split! We don't do anything - */ - if (!parameters[start] || (!strchr(parameters[start],','))) - { - return 0; - } + case 'm': + total += (atoi(n_field)*duration_m); + break; - /* This function can handle multiple comma seperated - * lists as one, which is a feature no actual commands - * have yet -- this is futureproofing in case we encounter - * a command that does. - */ - *paramlist = 0; + case 'h': + total += (atoi(n_field)*duration_h); + break; - for (int i = start; i <= end; i++) - { - if (parameters[i]) - { - strlcat(paramlist,parameters[i],MAXBUF); - } - } + case 'd': + total += (atoi(n_field)*duration_d); + break; - /* Now we split off paramlist into seperate parameters using - * pointer voodoo, this parameter list goes into sep_items - */ - j = 0; - param = paramlist; + case 'w': + total += (atoi(n_field)*duration_w); + break; - for (char* i = paramlist; *i; i++) - { - /* Found an item */ - if (*i == ',') - { - *i = '\0'; - sep_items[j++] = param; - /* Iterate along to next item, if there is one */ - param = i+1; - if ((unsigned int)j > Config->MaxTargets) - { - /* BZZT! Too many items */ - WriteServ(u->fd,"407 %s %s :Too many targets in list, message not delivered.",u->nick,sep_items[j-1]); - return 1; + case 'y': + total += (atoi(n_field)*duration_y); + break; } + n_field[0] = 0; } } - sep_items[j++] = param; - total = j; + // add trailing seconds + total += atoi(n_field); + + return total; +} + +/* 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. + */ +int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra) +{ + /* 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; - /* We add this extra comma here just to ensure we get all the keys - * in the event the user gave a malformed key string (yes, you guessed - * it, this is a mirc-ism) + /** 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. + * ...VOOODOOOO! */ - if ((joins) && (*keylist) && (total>0)) // more than one channel and is joining - { - charlcat(keylist,',',MAXBUF); - } + std::map dupes; - /* If we're doing JOIN handling (e.g. we've had to kludge for two - * lists being handled at once, real smart by the way JRO ) - * and we also have keys, we must seperate out this key list into - * our char** list sep_keys for later use. + /* Create two lists, one for channel names, one for keys + */ + irc::commasepstream items1(parameters[splithere]); + irc::commasepstream items2(parameters[extra]); + 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. */ - if ((joins) && (*keylist)) + while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) { - /* There is more than one key */ - if (strchr(keylist,',')) + if (dupes.find(item.c_str()) == dupes.end()) { - j = 0; - param = keylist; - for (char* i = keylist; *i; i++) - { - if (*i == ',') - { - *i = '\0'; - sep_keys[j++] = param; - param = i+1; - } - } + const char* new_parameters[127]; + + for (int t = 0; (t < pcnt) && (t < 127); t++) + new_parameters[t] = parameters[t]; + + std::string extrastuff = items2.GetToken(); + + new_parameters[splithere] = item.c_str(); + new_parameters[extra] = extrastuff.c_str(); + + CommandObj->Handle(new_parameters,pcnt,user); - sep_keys[j++] = param; - total2 = j; + dupes[item.c_str()] = true; } } + return 1; +} + +int CommandParser::LoopCall(userrec* user, command_t* 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; - /* Now the easier bit. We call the command class's Handle function - * X times, where x is the number of parameters we've 'collated'. + std::map dupes; + + /* Only one commasepstream here */ + irc::commasepstream items1(parameters[splithere]); + 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 */ - for (j = 0; j < total; j++) + while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets)) { - if (sep_items[j]) + if (dupes.find(item.c_str()) == dupes.end()) { - pars[0] = sep_items[j]; - } + const char* new_parameters[127]; - for (q = end; q < pcnt-1; q++) - { - if (parameters[q+1]) - { - pars[q-end+1] = parameters[q+1]; - } - } + for (int t = 0; (t < pcnt) && (t < 127); t++) + new_parameters[t] = parameters[t]; - if ((joins) && (parameters[1])) - { - if (pcnt > 1) - { - pars[1] = sep_keys[j]; - } - else - { - pars[1] = NULL; - } - } + new_parameters[splithere] = item.c_str(); - /* repeatedly call the function with the hacked parameter list */ - if ((joins) && (pcnt > 1)) - { - if (pars[1]) - { - /* pars[1] already set up and containing key from sep_keys[j] */ - fn->Handle(pars,2,u); - } - else - { - pars[1] = parameters[1]; - fn->Handle(pars,2,u); - } - } - else - { - fn->Handle(pars,pcnt-(end-start),u); + 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; } } - + /* 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, userrec * user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -305,7 +238,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use { if (n->second->flags_needed) { - return ((user->HasPermission(commandname)) || (is_uline(user->server))); + return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server))); } return true; } @@ -314,11 +247,20 @@ bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, use return false; } +command_t* CommandParser::GetHandler(const std::string &commandname) +{ + command_table::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 char** parameters, int pcnt, userrec *user) { - nspace::hash_map::iterator n = cmdlist.find(commandname); + command_table::iterator n = cmdlist.find(commandname); if (n != cmdlist.end()) { @@ -330,103 +272,92 @@ bool CommandParser::CallHandler(const std::string &commandname,const char** para { if ((user->HasPermission(commandname)) || (!IS_LOCAL(user))) { - n->second->Handle(parameters,pcnt,user); - return true; + return n->second->Handle(parameters,pcnt,user); } } else { - n->second->Handle(parameters,pcnt,user); - return true; + return n->second->Handle(parameters,pcnt,user); } } } } - return false; + return CMD_INVALID; } void CommandParser::ProcessCommand(userrec *user, std::string &cmd) { const char *command_p[127]; int items = 0; - std::string para[127]; irc::tokenstream tokens(cmd); - std::string xcommand = tokens.GetToken(); + std::string command; + tokens.GetToken(command); + + /* 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.c_str() == ':') + tokens.GetToken(command); + + while (tokens.GetToken(para[items]) && (items < 127)) + { + command_p[items] = para[items].c_str(); + items++; + } - while (((para[items] = tokens.GetToken()) != "") && (items < 127)) - command_p[items] = para[items++].c_str(); + std::transform(command.begin(), command.end(), command.begin(), ::toupper); int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(xcommand,command_p,items,user,false)); + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd)); if (MOD_RESULT == 1) { return; } - nspace::hash_map::iterator cm = cmdlist.find(xcommand); + command_table::iterator cm = cmdlist.find(command); if (cm != cmdlist.end()) { if (user) { /* activity resets the ping pending timer */ - user->nping = TIME + user->pingmax; - if (items < cm->second->min_params) - { - log(DEBUG,"not enough parameters: %s %s",user->nick,xcommand.c_str()); - WriteServ(user->fd,"461 %s %s :Not enough parameters",user->nick,xcommand.c_str()); - return; - } + user->nping = ServerInstance->Time() + user->pingmax; if (cm->second->flags_needed) { if (!user->IsModeSet(cm->second->flags_needed)) { - log(DEBUG,"permission denied: %s %s",user->nick,xcommand.c_str()); - WriteServ(user->fd,"481 %s :Permission Denied- You do not have the required operator privilages",user->nick); + user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick); return; } - } - if ((cm->second->flags_needed) && (!user->HasPermission(xcommand))) - { - log(DEBUG,"permission denied: %s %s",user->nick,xcommand.c_str()); - WriteServ(user->fd,"481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,xcommand.c_str()); - return; - } - /* if the command isnt USER, PASS, or NICK, and nick is empty, - * deny command! */ - if ((cm->second != command_user) && (cm->second != command_nick) && (cm->second != command_pass)) - { - if ((!isnick(user->nick)) || (user->registered != 7)) + if (!user->HasPermission(command)) { - log(DEBUG,"not registered: %s %s",user->nick,xcommand.c_str()); - WriteServ(user->fd,"451 %s :You have not registered",xcommand.c_str()); + 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 == 7) && (!*user->oper) && (*Config->DisabledCommands)) + if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) { - /* XXX: We should have a disabled setting in the command object, and on rehash set the disabled flag - * in the ones which are disabled, rather than this craq - */ - std::stringstream dcmds(Config->DisabledCommands); - std::string thiscmd; - while (dcmds >> thiscmd) - { - if (!strcasecmp(thiscmd.c_str(),xcommand.c_str())) - { - // command is disabled! - WriteServ(user->fd,"421 %s %s :This command has been disabled.",user->nick,xcommand.c_str()); - return; - } - } + /* 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) && (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()); + return; } - if ((user->registered == 7) || (cm->second == command_user) || (cm->second == command_nick) || (cm->second == command_pass)) + if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg())) { /* ikky /stats counters */ cm->second->use_count++; cm->second->total_bytes += cmd.length(); int MOD_RESULT = 0; - FOREACH_RESULT(I_OnPreCommand,OnPreCommand(xcommand,command_p,items,user,true)); + FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd)); if (MOD_RESULT == 1) return; @@ -435,13 +366,14 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) * command handler call, as the handler * may free the user structure! */ + CmdResult result = cm->second->Handle(command_p,items,user); - cm->second->Handle(command_p,items,user); + FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd)); return; } else { - WriteServ(user->fd,"451 %s :You have not registered",xcommand.c_str()); + user->WriteServ("451 %s :You have not registered",command.c_str()); return; } } @@ -449,34 +381,39 @@ void CommandParser::ProcessCommand(userrec *user, std::string &cmd) else if (user) { ServerInstance->stats->statsUnknown++; - WriteServ(user->fd,"421 %s %s :Unknown command",user->nick,xcommand.c_str()); + user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str()); } } bool CommandParser::RemoveCommands(const char* source) { - bool go_again = true; - - while (go_again) + command_table::iterator i,safei; + for (i = cmdlist.begin(); i != cmdlist.end(); i++) { - go_again = false; - - for (nspace::hash_map::iterator i = cmdlist.begin(); i != cmdlist.end(); i++) + safei = i; + safei++; + if (safei != cmdlist.end()) { - command_t* x = i->second; - if (x->source == std::string(source)) - { - log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str()); - cmdlist.erase(i); - go_again = true; - break; - } + RemoveCommand(safei, source); } } - + safei = cmdlist.begin(); + if (safei != cmdlist.end()) + { + RemoveCommand(safei, source); + } return true; } +void CommandParser::RemoveCommand(command_table::iterator safei, const char* source) +{ + command_t* x = safei->second; + if (x->source == std::string(source)) + { + cmdlist.erase(safei); + } +} + void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) { std::string::size_type a; @@ -484,96 +421,158 @@ void CommandParser::ProcessBuffer(std::string &buffer,userrec *user) if (!user) return; - 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); - log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str()); - - this->ProcessCommand(user,buffer); + if (buffer.length()) + { + if (!user->muted) + { + ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str()); + this->ProcessCommand(user,buffer); + } + } } -bool CommandParser::CreateCommand(command_t *f) +bool CommandParser::CreateCommand(command_t *f, void* so_handle) { + 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()) { cmdlist[f->command] = f; - log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params); return true; } else return false; } -CommandParser::CommandParser() +CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance) { + para.resize(128); this->SetupCommandTable(); } +bool CommandParser::FindSym(void** v, void* h) +{ + *v = dlsym(h, "init_command"); + const char* err = dlerror(); + if (err && !(*v)) + { + ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err); + return false; + } + return true; +} + +bool CommandParser::ReloadCommand(const char* cmd) +{ + 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); + + if (command != RFCCommands.end()) + { + command_t* 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); + + snprintf(filename, MAXBUF, "cmd_%s.so", commandname); + this->LoadCommand(filename); + + return true; + } + + return false; +} + +CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user) +{ + user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]); + if (ServerInstance->Parser->ReloadCommand(parameters[0])) + { + 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'", user->nick, parameters[0]); + return CMD_FAILURE; + } +} + +void CommandParser::LoadCommand(const char* name) +{ + char filename[MAXBUF]; + void* h; + command_t* (*cmd_factory_func)(InspIRCd*); + + snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name); + h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL); + + if (!h) + { + ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror()); + return; + } + + if (this->FindSym((void **)&cmd_factory_func, h)) + { + command_t* newcommand = cmd_factory_func(ServerInstance); + this->CreateCommand(newcommand, h); + } +} + 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; - command_nick = new cmd_nick; - command_pass = new cmd_pass; - 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); - this->CreateCommand(new cmd_version); - this->CreateCommand(new cmd_ping); - this->CreateCommand(new cmd_pong); - this->CreateCommand(new cmd_admin); - this->CreateCommand(new cmd_privmsg); - this->CreateCommand(new cmd_info); - this->CreateCommand(new cmd_time); - this->CreateCommand(new cmd_whois); - this->CreateCommand(new cmd_wallops); - this->CreateCommand(new cmd_notice); - this->CreateCommand(new cmd_join); - this->CreateCommand(new cmd_names); - this->CreateCommand(new cmd_part); - this->CreateCommand(new cmd_kick); - this->CreateCommand(new cmd_mode); - this->CreateCommand(new cmd_topic); - this->CreateCommand(new cmd_who); - this->CreateCommand(new cmd_motd); - this->CreateCommand(new cmd_rules); - this->CreateCommand(new cmd_oper); - this->CreateCommand(new cmd_list); - this->CreateCommand(new cmd_die); - this->CreateCommand(new cmd_restart); - this->CreateCommand(new cmd_kill); - this->CreateCommand(new cmd_rehash); - this->CreateCommand(new cmd_lusers); - this->CreateCommand(new cmd_stats); - this->CreateCommand(new cmd_userhost); - this->CreateCommand(new cmd_away); - this->CreateCommand(new cmd_ison); - this->CreateCommand(new cmd_summon); - this->CreateCommand(new cmd_users); - this->CreateCommand(new cmd_invite); - this->CreateCommand(new cmd_trace); - this->CreateCommand(new cmd_whowas); - this->CreateCommand(new cmd_connect); - this->CreateCommand(new cmd_squit); - this->CreateCommand(new cmd_modules); - this->CreateCommand(new cmd_links); - this->CreateCommand(new cmd_map); - this->CreateCommand(new cmd_kline); - this->CreateCommand(new cmd_gline); - this->CreateCommand(new cmd_zline); - this->CreateCommand(new cmd_qline); - this->CreateCommand(new cmd_eline); - this->CreateCommand(new cmd_loadmodule); - this->CreateCommand(new cmd_unloadmodule); - this->CreateCommand(new cmd_server); - this->CreateCommand(new cmd_commands); + RFCCommands.clear(); + + printf("\nLoading core commands"); + fflush(stdout); + + DIR* library = opendir(LIBRARYDIR); + if (library) + { + dirent* entry = NULL; + while ((entry = readdir(library))) + { + if (match(entry->d_name, "cmd_*.so")) + { + printf("."); + fflush(stdout); + this->LoadCommand(entry->d_name); + } + } + closedir(library); + printf("\n"); + } + + this->CreateCommand(new cmd_reload(ServerInstance)); } +