-/* +------------------------------------+
+ /* +------------------------------------+
* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * 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 "wildcard.h"
#include "xline.h"
#include "socketengine.h"
-#include "userprocess.h"
#include "socket.h"
#include "command_parse.h"
if (!*server)
return true;
- return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
+ return (Config->ulines.find(server) != Config->ulines.end());
}
-int InspIRCd::OperPassCompare(const char* data,const char* input)
+bool InspIRCd::SilentULine(const char* server)
+{
+ std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+ if (n != Config->ulines.end())
+ return n->second;
+ else return false;
+}
+
+int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
{
int MOD_RESULT = 0;
- FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
- Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
+ FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
if (MOD_RESULT == 1)
return 0;
if (MOD_RESULT == -1)
return 1;
- Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
return strcmp(data,input);
}
+std::string InspIRCd::TimeString(time_t curtime)
+{
+ return std::string(ctime(&curtime),24);
+}
+
long InspIRCd::Duration(const char* str)
{
char n_field[MAXBUF];
return total;
}
-/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
-
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
-{
- char buffer[MAXBUF];
- char itrigger[MAXBUF];
- long matches = 0;
-
- if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
- strlcpy(itrigger,"95.5",MAXBUF);
-
- if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
- return false;
-
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- strlcpy(buffer,u->second->ident,MAXBUF);
- charlcat(buffer,'@',MAXBUF);
- strlcat(buffer,u->second->host,MAXBUF);
- if (match(buffer,mask.c_str()))
- matches++;
- }
- float percent = ((float)matches / (float)clientlist.size()) * 100;
- if (percent > (float)atof(itrigger))
- {
- WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
- return true;
- }
- return false;
-}
-
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
-{
- char itrigger[MAXBUF];
- long matches = 0;
-
- if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
- strlcpy(itrigger,"95.5",MAXBUF);
-
- if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
- return false;
-
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (match(u->second->GetIPString(),ip.c_str(),true))
- matches++;
- }
-
- float percent = ((float)matches / (float)clientlist.size()) * 100;
- if (percent > (float)atof(itrigger))
- {
- WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
- return true;
- }
- return false;
-}
-
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
-{
- char itrigger[MAXBUF];
- long matches = 0;
-
- if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
- strlcpy(itrigger,"95.5",MAXBUF);
-
- if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
- return false;
-
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (match(u->second->nick,nick.c_str()))
- matches++;
- }
-
- float percent = ((float)matches / (float)clientlist.size()) * 100;
- if (percent > (float)atof(itrigger))
- {
- WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
- return true;
- }
- return false;
-}
-
/* 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,
if (!strchr(parameters[splithere],','))
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.
+ * ...VOOODOOOO!
+ */
+ std::map<irc::string, bool> 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 item = "*";
unsigned int max = 0;
/* Attempt to iterate these lists and call the command objech
*/
while (((item = items1.GetToken()) != "") && (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())
+ {
+ 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;
}
if (!strchr(parameters[splithere],','))
return 0;
+ std::map<irc::string, bool> 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.
*/
while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
{
- parameters[splithere] = item.c_str();
- CommandObj->Handle(parameters,pcnt,user);
+ 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];
+
+ 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;
+ }
}
/* 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
bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ command_table::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
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
CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ command_table::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
{
const char *command_p[127];
int items = 0;
- std::string para[127];
irc::tokenstream tokens(cmd);
- std::string command = 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 (((para[items] = tokens.GetToken()) != "") && (items < 127))
+ while (tokens.GetToken(para[items]) && (items < 127))
{
command_p[items] = para[items].c_str();
items++;
std::transform(command.begin(), command.end(), command.begin(), ::toupper);
int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,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<std::string,command_t*>::iterator cm = cmdlist.find(command);
+ command_table::iterator cm = cmdlist.find(command);
if (cm != cmdlist.end())
{
{
if (!user->IsModeSet(cm->second->flags_needed))
{
- user->WriteServ("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 (!user->HasPermission(command))
{
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()))
+ 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;
}
cm->second->total_bytes += cmd.length();
int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true));
+ FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
if (MOD_RESULT == 1)
return;
*/
CmdResult result = cm->second->Handle(command_p,items,user);
- FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result));
+ FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
return;
}
else
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<std::string,command_t*>::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))
- {
- ServerInstance->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;
if (buffer.length())
{
- ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
- this->ProcessCommand(user,buffer);
+ if (!user->muted)
+ {
+ ServerInstance->Log(DEBUG,"-> :%s %s",user->nick,buffer.c_str());
+ this->ProcessCommand(user,buffer);
+ }
}
}
if (so_handle)
{
if (RFCCommands.find(f->command) == RFCCommands.end())
- {
RFCCommands[f->command] = so_handle;
- ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle);
- }
else
{
ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
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;
CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
{
+ para.resize(128);
this->SetupCommandTable();
}
dlclose(command->second);
RFCCommands.erase(command);
- sprintf(filename, "cmd_%s.so", commandname);
+ snprintf(filename, MAXBUF, "cmd_%s.so", commandname);
this->LoadCommand(filename);
return true;
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
command_t* (*cmd_factory_func)(InspIRCd*);
snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
- ServerInstance->Log(DEBUG,"Load command: %s", filename);
-
h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
if (!h)