* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
#include "inspircd.h"
#include "wildcard.h"
#include "xline.h"
+#include "bancache.h"
/*
* This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
if (ELines.empty())
return;
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
{
/*IdentHostPair ih = IdentSplit(hostmask);*/
+ ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
+
if (DelLine(line->Displayable(), line->type, user, true))
return false;
if (simulate)
return true;
+ ServerInstance->BanCache->RemoveEntries(y->second->type, true);
+
FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
y->second->Unset();
void ELine::Unset()
{
/* remove exempt from everyone and force recheck after deleting eline */
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
u->exempt = false;
// removes lines that have expired
void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
{
- item->second->DisplayExpiry();
- item->second->Unset();
+ FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
+
+ item->second->DisplayExpiry();
+ item->second->Unset();
- /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
- * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
- * -- Brain
- */
- std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
- if (pptr != pending_lines.end())
- pending_lines.erase(pptr);
+ /* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
+ * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
+ * -- Brain
+ */
+ std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
+ if (pptr != pending_lines.end())
+ pending_lines.erase(pptr);
- delete item->second;
- container->second.erase(item);
+ delete item->second;
+ container->second.erase(item);
}
// applies lines, removing clients and changing nicks etc as applicable
void XLineManager::ApplyLines()
{
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
{
}
-void XLine::DefaultApply(User* u, const std::string &line)
+void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
{
char reason[MAXBUF];
snprintf(reason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
User::QuitUser(ServerInstance, u, line + "-Lined", reason);
else
User::QuitUser(ServerInstance, u, reason);
+
+
+ if (bancache)
+ {
+ ServerInstance->Log(DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
+ ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
+ }
}
bool KLine::Matches(User *u)
void KLine::Apply(User* u)
{
- DefaultApply(u, "K");
+ DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool GLine::Matches(User *u)
void GLine::Apply(User* u)
{
- DefaultApply(u, "G");
+ DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
}
bool ELine::Matches(User *u)
void ZLine::Apply(User* u)
{
- DefaultApply(u, "Z");
+ DefaultApply(u, "Z", true);
}
void QLine::Apply(User* u)
{
- /* Can we force the user to their uid here instead? */
- DefaultApply(u, "Q");
+ /* Force to uuid on apply of qline, no need to disconnect any more :) */
+ u->ForceNickChange(u->uuid);
}
void ELine::OnAdd()
{
/* When adding one eline, only check the one eline */
- for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+ for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
{
User* u = (User*)(*u2);
if (this->Matches(u))
{
XLineFactMap::iterator n = line_factory.find(type);
- if (n != line_factory.end())
+ if (n == line_factory.end())
return NULL;
return n->second;