* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
{
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;
- return data != input; // this seems back to front, but returns 0 if they *match*, 1 else
+
+ /* 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.
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
*/
CommandObj->Handle(new_parameters, user);
- dupes[item.c_str()] = true;
+ dupes.insert(item.c_str());
}
}
return 1;
if (parameters[splithere].find(',') == std::string::npos)
return 0;
- std::map<irc::string, bool> dupes;
+ std::set<irc::string> dupes;
/* Only one commasepstream here */
irc::commasepstream items1(parameters[splithere]);
/* Execute the command handler. */
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,
void CommandParser::DoLines(User* current, bool one_only)
{
- // while there are complete lines to process...
- unsigned int floodlines = 0;
-
while (current->BufferIsReady())
{
- if (current->MyClass)
- {
- if (ServerInstance->Time() > current->reset_due)
- {
- current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold();
- current->lines_in = 0;
- }
-
- if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood())
- {
- ServerInstance->FloodQuitUser(current);
- return;
- }
-
- if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0))
- {
- ServerInstance->FloodQuitUser(current);
- return;
- }
- }
-
// use GetBuffer to copy single lines into the sanitized string
std::string single_line = current->GetBuffer();
current->bytes_in += single_line.length();
command_p.push_back(token);
std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-
+
/* find the command, check it exists */
Commandtable::iterator cm = cmdlist.find(command);
-
+
if (cm == cmdlist.end())
{
int MOD_RESULT = 0;
* Thanks dz for making me actually understand why this is necessary!
* -- w00t
*/
- Commandtable::iterator cm = cmdlist.find(command);
+ cm = cmdlist.find(command);
if (cm == cmdlist.end())
{
if (user->registered == REG_ALL)
{
// BE CAREFUL: .end() returns past the end of the vector, hence decrement.
std::vector<std::string>::iterator it = --command_p.end();
-
+
lparam.insert(0, " " + *(it));
command_p.erase(it); // remove last element
}
/* Modify the user's penalty */
bool do_more = true;
- if (!user->ExemptFromPenalty)
+ if (!user->HasPrivPermission("users/flood/no-throttle"))
{
user->IncreasePenalty(cm->second->Penalty);
do_more = (user->Penalty < 10);
- if (!do_more)
- user->OverPenalty = true;
}
/* activity resets the ping pending timer */
return false;
}
-CmdResult cmd_reload::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
{
if (parameters.size() < 1)
return CMD_FAILURE;
return NULL;
}
-void CommandParser::SetupCommandTable(User* user)
+/** This is only invoked on startup
+ */
+void CommandParser::SetupCommandTable()
{
- RFCCommands.clear();
-
- if (!user)
- {
- printf("\nLoading core commands");
- fflush(stdout);
- }
+ 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"))
+ if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
{
- if (!user)
- {
- printf(".");
- fflush(stdout);
- }
+ printf(".");
+ fflush(stdout);
+
const char* err = this->LoadCommand(entry->d_name);
if (err)
{
- if (user)
- {
- user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick.c_str(), entry->d_name, err);
- }
- else
- {
- printf("Error loading %s: %s", entry->d_name, err);
- exit(EXIT_STATUS_BADHANDLER);
- }
+ printf("Error loading %s: %s", entry->d_name, err);
+ exit(EXIT_STATUS_BADHANDLER);
}
}
}
closedir(library);
- if (!user)
- printf("\n");
+ printf("\n");
}
if (cmdlist.find("RELOAD") == cmdlist.end())
- this->CreateCommand(new cmd_reload(ServerInstance));
+ this->CreateCommand(new CommandReload(ServerInstance));
+}
+
+int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest)
+{
+ std::deque<std::string>::const_iterator items = source.begin();
+ std::deque<TranslateType>::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)
else
dest = source;
break;
- case TR_NICKLIST:
- {
- /* Translate comma seperated list of nicknames */
- irc::commasepstream items(source);
- while (items.GetToken(item))
- {
- user = ServerInstance->FindNick(item);
- if (user)
- {
- dest.append(user->uuid);
- translations++;
- }
- else
- dest.append(item);
- dest.append(",");
- }
- if (!dest.empty())
- dest.erase(dest.end() - 1);
- }
- break;
- case TR_SPACENICKLIST:
- {
- /* Translate space seperated list of nicknames */
- irc::spacesepstream items(source);
- while (items.GetToken(item))
- {
- user = ServerInstance->FindNick(item);
- if (user)
- {
- dest.append(user->uuid);
- translations++;
- }
- else
- dest.append(item);
- dest.append(" ");
- }
- if (!dest.empty())
- dest.erase(dest.end() - 1);
- }
- break;
case TR_END:
case TR_TEXT:
default:
return translations;
}
-
-
projects / user / henk / code / inspircd.git / blobdiff