-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include "configreader.h"
-#include <algorithm>
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "socketengine.h"
-#include "socket.h"
-#include "command_parse.h"
-
-/* Directory Searching for Unix-Only */
-#ifndef WIN32
-#include <dirent.h>
-#include <dlfcn.h>
-#endif
-
-bool InspIRCd::ULine(const char* server)
-{
- if (!server)
- return false;
- if (!*server)
- return true;
- return (Config->ulines.find(server) != Config->ulines.end());
-}
+#include "inspircd.h"
-bool InspIRCd::SilentULine(const char* server)
+int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
{
- std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
- if (n != Config->ulines.end())
- return n->second;
- else return false;
-}
+ ModResult res;
+ FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
-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)
+ /* Module matched */
+ if (res == MOD_RES_ALLOW)
return 0;
- if (MOD_RESULT == -1)
- return 1;
- return strcmp(data,input);
-}
-std::string InspIRCd::TimeString(time_t curtime)
-{
- return std::string(ctime(&curtime),24);
-}
+ /* Module explicitly didnt match */
+ if (res == MOD_RES_DENY)
+ return 1;
-/** Refactored by Brain, Jun 2007. Much faster with some clever O(1) array
- * lookups and pointer maths.
- */
-long InspIRCd::Duration(const std::string &str)
-{
- unsigned char multiplier = 0;
- long total = 0;
- long times = 1;
- long subtotal = 0;
+ /* 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;
- /* Iterate each item in the string, looking for number or multiplier */
- for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i)
- {
- /* Found a number, queue it onto the current number */
- if ((*i >= '0') && (*i <= '9'))
- {
- subtotal = subtotal + ((*i - '0') * times);
- times = times * 10;
- }
- else
- {
- /* Found something thats not a number, find out how much
- * it multiplies the built up number by, multiply the total
- * and reset the built up number.
- */
- if (subtotal)
- total += subtotal * duration_multi[multiplier];
-
- /* Next subtotal please */
- subtotal = 0;
- multiplier = *i;
- times = 1;
- }
- }
- if (multiplier)
- {
- total += subtotal * duration_multi[multiplier];
- subtotal = 0;
- }
- /* Any trailing values built up are treated as raw seconds */
- return total + subtotal;
+ 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.
* 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<std::string>& 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<irc::string, bool> dupes;
+ std::set<irc::string> dupes;
/* Create two lists, one for channel names, one for keys
*/
irc::commasepstream items1(parameters[splithere]);
- irc::commasepstream items2(parameters[extra]);
- std::string item("*");
+ irc::commasepstream items2(extra >= 0 ? parameters[extra] : "");
+ 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))
- {
- if (dupes.find(item.c_str()) == dupes.end())
- {
- 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);
-
- 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;
-
- std::map<irc::string, bool> 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
- */
- while (((item = items1.GetToken()) != "") && (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[127];
-
- for (int t = 0; (t < pcnt) && (t < 127); t++)
- new_parameters[t] = parameters[t];
+ std::vector<std::string> new_parameters(parameters);
- new_parameters[splithere] = item.c_str();
+ if (!items2.GetToken(extrastuff))
+ extrastuff.clear();
- parameters[splithere] = item.c_str();
+ new_parameters[splithere] = item;
+ if (extra >= 0)
+ new_parameters[extra] = extrastuff;
- /* 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);
+ CommandObj->Handle(new_parameters, 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, userrec * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
{
- command_table::iterator n = cmdlist.find(commandname);
+ Commandtable::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
- if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
+ if ((pcnt >= n->second->min_params))
{
- 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->ULine(user->server)));
+ return (user->HasPermission(commandname));
}
+ }
+ else
+ {
return true;
}
}
return false;
}
-command_t* CommandParser::GetHandler(const std::string &commandname)
+Command* CommandParser::GetHandler(const std::string &commandname)
{
- command_table::iterator n = cmdlist.find(commandname);
+ Commandtable::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
return n->second;
// calls a handler function for a command
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
{
- command_table::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)
{
- 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)))
- {
- return n->second->Handle(parameters,pcnt,user);
- }
- }
- else
+ /* if user is local, and flags are needed .. */
+
+ if (user->IsModeSet(n->second->flags_needed))
{
- return n->second->Handle(parameters,pcnt,user);
+ /* 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 CMD_INVALID;
}
-void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
+bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
{
- const char *command_p[127];
- int items = 0;
+ std::vector<std::string> 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)
* 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 < 127))
- {
- 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;
+
+ /* find the command, check it exists */
+ 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;
}
- command_table::iterator cm = cmdlist.find(command);
-
- if (cm != cmdlist.end())
+
+ if (cm == cmdlist.end())
{
- if (user)
+ 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())
{
- /* 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 privileges",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) && (!IS_OPER(user)) && (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) && (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 == 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(command,command_p,items,user,true,cmd));
- if (MOD_RESULT == 1)
- return;
-
- /*
- * WARNING: nothing may come after the
- * command handler call, as the handler
- * may free the user structure!
- */
- CmdResult result = cm->second->Handle(command_p,items,user);
-
- FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
- 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)
- {
- ServerInstance->stats->statsUnknown++;
- user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
- }
-}
-bool CommandParser::RemoveCommands(const char* source)
-{
- command_table::iterator i,safei;
- for (i = cmdlist.begin(); i != cmdlist.end(); i++)
+ if (cm->second->max_params && command_p.size() > cm->second->max_params)
{
- safei = i;
- safei++;
- if (safei != cmdlist.end())
+ /*
+ * 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))
{
- RemoveCommand(safei, source);
+ // BE CAREFUL: .end() returns past the end of the vector, hence decrement.
+ std::vector<std::string>::iterator it = command_p.end() - 1;
+
+ lparam.insert(0, " " + *(it));
+ command_p.erase(it); // remove last element
}
- }
- 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);
- delete x;
- }
-}
+ /* we now have (each iteration):
+ * ' test'
+ * ' a test'
+ * ' is a test' <-- final string
+ * ...now remove the ' ' at the start...
+ */
+ lparam.erase(lparam.begin());
-void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
-{
- std::string::size_type a;
+ /* param is now 'is a test', which is exactly what we wanted! */
+ command_p.push_back(lparam);
+ }
- if (!user)
- return;
+ /*
+ * 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;
- while ((a = buffer.rfind("\n")) != std::string::npos)
- buffer.erase(a);
- while ((a = buffer.rfind("\r")) != std::string::npos)
- buffer.erase(a);
+ /* activity resets the ping pending timer */
+ user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
- if (buffer.length())
+ if (cm->second->flags_needed)
{
- if (!user->muted)
+ if (!user->IsModeSet(cm->second->flags_needed))
+ {
+ 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))
{
- ServerInstance->Log(DEBUG,"C[%d] -> :%s %s",user->GetFd(), user->nick, buffer.c_str());
- this->ProcessCommand(user,buffer);
+ 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;
}
}
-}
-
-bool CommandParser::CreateCommand(command_t *f, void* so_handle)
-{
- if (so_handle)
+ if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
{
- if (RFCCommands.find(f->command) == RFCCommands.end())
- RFCCommands[f->command] = so_handle;
+ /* command is disabled! */
+ user->CommandFloodPenalty += failpenalty;
+ if (ServerInstance->Config->DisabledDontExist)
+ {
+ user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+ }
else
{
- ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
- return false;
+ 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;
}
- /* create the command and push it onto the table */
- if (cmdlist.find(f->command) == cmdlist.end())
+ 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)
{
- cmdlist[f->command] = f;
- return true;
+ 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->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->CommandFloodPenalty += failpenalty;
+ user->WriteNumeric(ERR_NOTREGISTERED, "%s %s :You have not registered", user->nick.c_str(), 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 */
+ 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, user);
+
+ FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd));
+ return do_more;
}
- else return false;
}
-CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
+void CommandParser::RemoveCommand(Command* x)
{
- para.resize(128);
- this->SetupCommandTable();
+ Commandtable::iterator n = cmdlist.find(x->name);
+ if (n != cmdlist.end() && n->second == x)
+ cmdlist.erase(n);
}
-bool CommandParser::FindSym(void** v, void* h)
+Command::~Command()
{
- *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;
+ ServerInstance->Parser->RemoveCommand(this);
}
-bool CommandParser::ReloadCommand(const char* cmd)
+bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
{
- char filename[MAXBUF];
- char commandname[MAXBUF];
- int y = 0;
-
- for (const char* x = cmd; *x; x++, y++)
- commandname[y] = toupper(*x);
-
- commandname[y] = 0;
+ if (!user || buffer.empty())
+ return true;
- SharedObjectList::iterator command = RFCCommands.find(commandname);
+ 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);
+}
- if (command != RFCCommands.end())
+bool CommandParser::AddCommand(Command *f)
+{
+ /* create the command and push it onto the table */
+ if (cmdlist.find(f->name) == cmdlist.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);
-
+ cmdlist[f->name] = f;
return true;
}
-
return false;
}
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user)
+CommandParser::CommandParser()
{
- 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)
+int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest, bool prefix_final, Command* custom_translator)
{
- 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);
+ std::vector<TranslateType>::const_iterator types = to.begin();
+ User* user = NULL;
+ unsigned int i;
+ int translations = 0;
+ dest.clear();
- if (!h)
+ for(i=0; i < source.size(); i++)
{
- ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror());
- return;
- }
+ TranslateType t;
+ std::string item = source[i];
- if (this->FindSym((void **)&cmd_factory_func, h))
- {
- command_t* newcommand = cmd_factory_func(ServerInstance);
- this->CreateCommand(newcommand, h);
+ if (types == to.end())
+ t = TR_TEXT;
+ else
+ {
+ t = *types;
+ types++;
+ }
+
+ if (prefix_final && i == source.size() - 1)
+ dest.append(":");
+
+ switch (t)
+ {
+ case TR_NICK:
+ /* Translate single nickname */
+ user = ServerInstance->FindNick(item);
+ if (user)
+ {
+ 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;
+ }
+ if (i != source.size() - 1)
+ dest.append(" ");
}
+
+ return translations;
}
-void CommandParser::SetupCommandTable()
+int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
{
- RFCCommands.clear();
+ User* user = NULL;
+ int translations = 0;
+ dest.clear();
- printf("\nLoading core commands");
- fflush(stdout);
-
- DIR* library = opendir(LIBRARYDIR);
- if (library)
+ switch (to)
{
- dirent* entry = NULL;
- while ((entry = readdir(library)))
- {
- if (match(entry->d_name, "cmd_*.so"))
+ case TR_NICK:
+ /* Translate single nickname */
+ user = ServerInstance->FindNick(source);
+ if (user)
{
- printf(".");
- fflush(stdout);
- this->LoadCommand(entry->d_name);
+ dest = user->uuid;
+ translations++;
}
- }
- closedir(library);
- printf("\n");
+ else
+ dest = source;
+ break;
+ case TR_END:
+ case TR_TEXT:
+ default:
+ /* Do nothing */
+ dest = source;
+ break;
}
- this->CreateCommand(new cmd_reload(ServerInstance));
+ return translations;
}
-
projects / user / henk / code / inspircd.git / blobdiff