X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=2fa6dda0039c9d8e9e742813d58fd54e883a2964;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=02560a97b5290475f855dc28660618eb0dbd0363;hpb=805d47c98e48df374976972c3fcbba36fd4289f8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 02560a97b..2fa6dda00 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -18,7 +18,7 @@ #include "bancache.h" /* - * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and + * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and * efficient as we can this time so we can close this file and never ever touch it again .. * * Background: @@ -167,21 +167,21 @@ bool XLineManager::AddLine(XLine* line, User* user) { ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here? - /* If the line exists, check if its an expired line */ + if (line->duration && ServerInstance->Time() > line->expiry) + return false; // Don't apply expired XLines. + + /* Don't apply duplicate xlines */ ContainerIter x = lookup_lines.find(line->type); if (x != lookup_lines.end()) { LookupIter i = x->second.find(line->Displayable()); if (i != x->second.end()) { - if (i->second->duration && ServerInstance->Time() > i->second->expiry) - ExpireLine(x, i); - else - return false; + return false; } } - /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ + /*ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ XLineFactory* xlf = GetFactory(line->type); if (!xlf) return false; @@ -192,7 +192,7 @@ bool XLineManager::AddLine(XLine* line, User* user) lookup_lines[line->type][line->Displayable()] = line; line->OnAdd(); - FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); + FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); return true; } @@ -261,20 +261,17 @@ XLine* XLineManager::MatchesLine(const std::string &type, User* user) safei = i; safei++; + if (i->second->duration && current > i->second->expiry) + { + /* Expire the line, proceed to next one */ + ExpireLine(x, i); + i = safei; + continue; + } + if (i->second->Matches(user)) { - if (i->second->duration && current > i->second->expiry) - { - /* Expire the line, return nothing */ - ExpireLine(x, i); - /* Continue, there may be another that matches - * (thanks aquanight) - */ - i = safei; - continue; - } - else - return i->second; + return i->second; } i = safei; @@ -341,9 +338,14 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item) // applies lines, removing clients and changing nicks etc as applicable void XLineManager::ApplyLines() { - for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) + std::vector::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin(); + while (u2 != ServerInstance->Users->local_users.rend()) { - User* u = (User*)(*u2); + User* u = *u2++; + + // Don't ban people who are exempt. + if (u->exempt) + continue; for (std::vector::iterator i = pending_lines.begin(); i != pending_lines.end(); i++) { @@ -387,13 +389,13 @@ void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, } -XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) +XLineManager::XLineManager() { - GFact = new GLineFactory(Instance); - EFact = new ELineFactory(Instance); - KFact = new KLineFactory(Instance); - QFact = new QLineFactory(Instance); - ZFact = new ZLineFactory(Instance); + GFact = new GLineFactory; + EFact = new ELineFactory; + KFact = new KLineFactory; + QFact = new QLineFactory; + ZFact = new ZLineFactory; RegisterFactory(GFact); RegisterFactory(EFact); @@ -426,7 +428,7 @@ XLineManager::~XLineManager() i->second.clear(); } lookup_lines.clear(); - + } void XLine::Apply(User* u) @@ -441,7 +443,7 @@ bool XLine::IsBurstable() void XLine::DefaultApply(User* u, const std::string &line, bool bancache) { char sreason[MAXBUF]; - snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason); + snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason.c_str()); if (*ServerInstance->Config->MoronBanner) u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner); @@ -480,7 +482,7 @@ bool KLine::Matches(User *u) void KLine::Apply(User* u) { - DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false); + DefaultApply(u, "K", (this->identmask == "*") ? true : false); } bool GLine::Matches(User *u) @@ -501,8 +503,8 @@ bool GLine::Matches(User *u) } void GLine::Apply(User* u) -{ - DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false); +{ + DefaultApply(u, "G", (this->identmask == "*") ? true : false); } bool ELine::Matches(User *u) @@ -534,7 +536,7 @@ bool ZLine::Matches(User *u) } void ZLine::Apply(User* u) -{ +{ DefaultApply(u, "Z", true); } @@ -548,7 +550,7 @@ bool QLine::Matches(User *u) } void QLine::Apply(User* u) -{ +{ /* Force to uuid on apply of qline, no need to disconnect any more :) */ u->ForceNickChange(u->uuid.c_str()); } @@ -598,27 +600,32 @@ void ELine::OnAdd() void ELine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)", + identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); } void QLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)", + nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); } void ZLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)", + ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); } void KLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)", + identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); } void GLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)", + identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time)); } const char* ELine::Displayable() @@ -638,12 +645,12 @@ const char* GLine::Displayable() const char* ZLine::Displayable() { - return ipaddr; + return ipaddr.c_str(); } const char* QLine::Displayable() { - return nick; + return nick.c_str(); } bool KLine::IsBurstable() @@ -684,4 +691,3 @@ XLineFactory* XLineManager::GetFactory(const std::string &type) return n->second; } -