X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=c696e7a3a27603cc4d6106198f7a0b238b157954;hb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;hp=f3a7b28b77c26093e5a3b3b8cfc958d4dee73270;hpb=5315db41ad4780f0185cf07d79660a645c738e25;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index f3a7b28b7..c696e7a3a 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 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 @@ -11,11 +11,11 @@ * --------------------------------------------------- */ -/* $Core: libIRCDxline */ +/* $Core */ #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 @@ -36,31 +36,17 @@ * than it could have been, something which we address here. * * VERSION 3: - * All lines are (as in v1) stored together -- no seperation of perm and non-perm. Expiry will - * still use a sorted list, and we'll just ignore anything permanent. + * All lines are (as in v1) stored together -- no seperation of perm and non-perm. They are stored in + * a map of maps (first map is line type, second map is for quick lookup on add/delete/etc). * - * Application will be by a list of lines 'pending' application, meaning only the newly added lines - * will be gone over. Much faster. + * Expiry is *no longer* performed on a timer, and no longer uses a sorted list of any variety. This + * is now done by only checking for expiry when a line is accessed, meaning that expiry is no longer + * a resource intensive problem. * - * More of course is to come. - */ - -/* Version two, now with optimized expiry! - * - * Because the old way was horrendously slow, the new way of expiring xlines is very - * very efficient. I have improved the efficiency of the algorithm in two ways: - * - * (1) There are now two lists of items for each linetype. One list holds temporary - * items, and the other list holds permanent items (ones which will expire). - * Items which are on the permanent list are NEVER checked at all by the - * expire_lines() function. - * (2) The temporary xline lists are always kept in strict numerical order, keyed by - * current time + duration. This means that the line which is due to expire the - * soonest is always pointed at by vector::begin(), so a simple while loop can - * very efficiently, very quickly and above all SAFELY pick off the first few - * items in the vector which need zapping. - * - * -- Brain + * Application no longer tries to apply every single line on every single user - instead, now only lines + * added since the previous application are applied. This keeps S2S ADDLINE during burst nice and fast, + * while at the same time not slowing things the fuck down when we try adding a ban with lots of preexisting + * bans. :) */ bool XLine::Matches(User *u) @@ -71,36 +57,87 @@ bool XLine::Matches(User *u) /* * Checks what users match a given vector of ELines and sets their ban exempt flag accordingly. */ -void XLineManager::CheckELines(std::map &ELines) +void XLineManager::CheckELines() { + ContainerIter n = lookup_lines.find("E"); + + if (n == lookup_lines.end()) + return; + + XLineLookup& ELines = n->second; + if (ELines.empty()) return; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { User* u = (User*)(*u2); - for (std::map::iterator i = ELines.begin(); i != ELines.end(); i++) + /* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */ + LookupIter safei; + + for (LookupIter i = ELines.begin(); i != ELines.end(); ) { + safei = i; + safei++; + XLine *e = i->second; u->exempt = e->Matches(u); + + i = safei; } } } -// this should probably be moved to configreader, but atm it relies on CheckELines above. -bool DoneELine(ServerConfig* conf, const char* tag) + +XLineLookup* XLineManager::GetAll(const std::string &type) { - for (std::vector::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++) + ContainerIter n = lookup_lines.find(type); + + if (n == lookup_lines.end()) + return NULL; + + LookupIter safei; + const time_t current = ServerInstance->Time(); + + /* Expire any dead ones, before sending */ + for (LookupIter x = n->second.begin(); x != n->second.end(); ) { - User* u = (User*)(*u2); - u->exempt = false; + safei = x; + safei++; + if (x->second->duration && current > x->second->expiry) + { + ExpireLine(n, x); + } + x = safei; } - conf->GetInstance()->XLines->CheckELines(conf->GetInstance()->XLines->lookup_lines['E']); - return true; + return &(n->second); } +void XLineManager::DelAll(const std::string &type) +{ + ContainerIter n = lookup_lines.find(type); + + if (n == lookup_lines.end()) + return; + + LookupIter x; + + /* Delete all of a given type (this should probably use DelLine, but oh well) */ + while ((x = n->second.begin()) != n->second.end()) + { + ExpireLine(n, x); + } +} + +std::vector XLineManager::GetAllTypes() +{ + std::vector items; + for (ContainerIter x = lookup_lines.begin(); x != lookup_lines.end(); ++x) + items.push_back(x->first); + return items; +} IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) { @@ -117,223 +154,194 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host) } else { + n.first = ""; n.second = ident_and_host; } return n; } -// adds a g:line +// adds a line -/*bool XLineManager::AddELine(long duration, const char* source, const char* reason, const char* hostmask)*/ bool XLineManager::AddLine(XLine* line, User* user) { - /*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 the line exists, check if its an expired line */ + 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; + } + } /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ + XLineFactory* xlf = GetFactory(line->type); + if (!xlf) + return false; + + if (xlf->AutoApplyToUserList(line)) + pending_lines.push_back(line); - active_lines.push_back(line); - sort(active_lines.begin(), active_lines.end(), XLineManager::XSortComparison); - pending_lines.push_back(line); lookup_lines[line->type][line->Displayable()] = line; line->OnAdd(); - if (!line->duration) - PermLines++; - FOREACH_MOD(I_OnAddLine,OnAddLine(user, line)); return true; } -/*bool XLineManager::AddZLine(long duration, const char* source, const char* reason, const char* ipaddr) +// deletes a line, returns true if the line existed and was removed + +bool XLineManager::DelLine(const char* hostmask, const std::string &type, User* user, bool simulate) { - if (strchr(ipaddr,'@')) - { - while (*ipaddr != '@') - ipaddr++; - ipaddr++; - }*/ + ContainerIter x = lookup_lines.find(type); -// deletes a g:line, returns true if the line existed and was removed + if (x == lookup_lines.end()) + return false; -bool XLineManager::DelLine(const char* hostmask, char type, User* user, bool simulate) -{ - IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - { - if ((*i)->type == type) - { - if ((*i)->MatchesLiteral(hostmask)) - { - if (!simulate) - { - (*i)->Unset(); + LookupIter y = x->second.find(hostmask); - if (lookup_lines.find(type) != lookup_lines.end()) - lookup_lines[type].erase(hostmask); + if (y == x->second.end()) + return false; - FOREACH_MOD(I_OnDelLine,OnDelLine(user, *i)); + if (simulate) + return true; - std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), *i); - if (pptr != pending_lines.end()) - pending_lines.erase(pptr); + ServerInstance->BanCache->RemoveEntries(y->second->type, true); - if (!(*i)->duration) - PermLines--; + FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second)); - delete *i; - active_lines.erase(i); - } - return true; - } - } - } + y->second->Unset(); - return false; + std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), y->second); + if (pptr != pending_lines.end()) + pending_lines.erase(pptr); + + delete y->second; + x->second.erase(y); + + return true; } void ELine::Unset() { /* remove exempt from everyone and force recheck after deleting eline */ - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { User* u = (User*)(*u2); u->exempt = false; } - if (ServerInstance->XLines->lookup_lines.find('E') != ServerInstance->XLines->lookup_lines.end()) - ServerInstance->XLines->CheckELines(ServerInstance->XLines->lookup_lines['E']); + ServerInstance->XLines->CheckELines(); } // returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match -QLine* XLineManager::matches_qline(const char* nick) -{ - if (lookup_lines.find('Q') == lookup_lines.end()) - return NULL; - - if (lookup_lines.find('Q') != lookup_lines.end() && lookup_lines['Q'].empty()) - return NULL; - - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->type == 'Q' && (*i)->Matches(nick)) - return (QLine*)(*i); - return NULL; -} - -// returns a pointer to the reason if a host matches a gline, NULL if it didnt match - -GLine* XLineManager::matches_gline(User* user) +XLine* XLineManager::MatchesLine(const std::string &type, User* user) { - if (lookup_lines.find('G') == lookup_lines.end()) - return NULL; + ContainerIter x = lookup_lines.find(type); - if (lookup_lines.find('G') != lookup_lines.end() && lookup_lines['G'].empty()) + if (x == lookup_lines.end()) return NULL; - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->type == 'G' && (*i)->Matches(user)) - return (GLine*)(*i); + const time_t current = ServerInstance->Time(); - return NULL; -} + LookupIter safei; -ELine* XLineManager::matches_exception(User* user) -{ - if (lookup_lines.find('E') == lookup_lines.end()) - return NULL; + for (LookupIter i = x->second.begin(); i != x->second.end(); ) + { + safei = i; + safei++; - if (lookup_lines.find('E') != lookup_lines.end() && lookup_lines['E'].empty()) - return NULL; + 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; + } - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - { - if ((*i)->type == 'E' && (*i)->Matches(user)) - return (ELine*)(*i); + i = safei; } return NULL; } -// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match - -ZLine* XLineManager::matches_zline(User *u) +XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern) { - if (lookup_lines.find('Z') == lookup_lines.end()) - return NULL; + ContainerIter x = lookup_lines.find(type); - if (lookup_lines.find('Z') != lookup_lines.end() && lookup_lines['Z'].empty()) + if (x == lookup_lines.end()) return NULL; - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->type == 'Z' && (*i)->Matches(u)) - return (ZLine*)(*i); - return NULL; -} - -// returns a pointer to the reason if a host matches a kline, NULL if it didnt match + const time_t current = ServerInstance->Time(); -KLine* XLineManager::matches_kline(User* user) -{ - if (lookup_lines.find('K') == lookup_lines.end()) - return NULL; + LookupIter safei; - if (lookup_lines.find('K') != lookup_lines.end() && lookup_lines['K'].empty()) - return NULL; + for (LookupIter i = x->second.begin(); i != x->second.end(); ) + { + safei = i; + safei++; - for (std::vector::iterator i = active_lines.begin(); i != active_lines.end(); i++) - if ((*i)->Matches(user)) - return (KLine*)(*i); + if (i->second->Matches(pattern)) + { + if (i->second->duration && current > i->second->expiry) + { + /* Expire the line, return nothing */ + ExpireLine(x, i); + /* See above */ + i = safei; + continue; + } + else + return i->second; + } + i = safei; + } return NULL; } -bool XLineManager::XSortComparison(const XLine *one, const XLine *two) -{ - return (one->expiry) < (two->expiry); -} - // removes lines that have expired -void XLineManager::expire_lines() +void XLineManager::ExpireLine(ContainerIter container, LookupIter item) { - time_t current = ServerInstance->Time(); + FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second)); - /* Because we now store all our XLines in sorted order using ((*i)->duration + (*i)->set_time) as a key, this - * means that to expire the XLines we just need to do a while, picking off the top few until there are - * none left at the head of the queue that are after the current time. We use PermLines as an offset into the - * vector past the first item with a duration 0. - */ - - std::vector::iterator start = active_lines.begin() + PermLines; - - while ((start < active_lines.end()) && (current > (*start)->expiry)) - { - (*start)->DisplayExpiry(); - (*start)->Unset(); - - if (lookup_lines.find((*start)->type) != lookup_lines.end()) - lookup_lines[(*start)->type].erase((*start)->Displayable()); + item->second->DisplayExpiry(); + item->second->Unset(); - std::vector::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), *start); - if (pptr != pending_lines.end()) - pending_lines.erase(pptr); - - if (!(*start)->duration) - PermLines--; + /* 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::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second); + if (pptr != pending_lines.end()) + pending_lines.erase(pptr); - delete *start; - active_lines.erase(start); - } + delete item->second; + container->second.erase(item); } + // applies lines, removing clients and changing nicks etc as applicable void XLineManager::ApplyLines() { - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { User* u = (User*)(*u2); @@ -348,30 +356,38 @@ void XLineManager::ApplyLines() pending_lines.clear(); } -/* k: 216 - * g: 223 - * q: 217 - * z: 223 - * e: 223 - */ - -void XLineManager::InvokeStats(const char type, int numeric, User* user, string_list &results) +void XLineManager::InvokeStats(const std::string &type, int numeric, User* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - std::map >::iterator n = lookup_lines.find(type); + ContainerIter n = lookup_lines.find(type); + + time_t current = ServerInstance->Time(); + + LookupIter safei; if (n != lookup_lines.end()) { - std::map& list = n->second; - for (std::map::iterator i = list.begin(); i != list.end(); i++) - results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+ + XLineLookup& list = n->second; + for (LookupIter i = list.begin(); i != list.end(); ) + { + safei = i; + safei++; + + if (i->second->duration && current > i->second->expiry) + { + ExpireLine(n, i); + } + else + results.push_back(sn+" "+ConvToStr(numeric)+" "+user->nick+" :"+i->second->Displayable()+" "+ ConvToStr(i->second->set_time)+" "+ConvToStr(i->second->duration)+" "+std::string(i->second->source)+" :"+(i->second->reason)); + i = safei; + } } } -XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance), PermLines(0) +XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance) { GFact = new GLineFactory(Instance); EFact = new ELineFactory(Instance); @@ -399,22 +415,50 @@ XLineManager::~XLineManager() delete KFact; delete QFact; delete ZFact; + + // Delete all existing XLines + for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++) + { + for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++) + { + delete j->second; + } + i->second.clear(); + } + lookup_lines.clear(); + } void XLine::Apply(User* u) { } -void XLine::DefaultApply(User* u, char line) +bool XLine::IsBurstable() { - char reason[MAXBUF]; - snprintf(reason, MAXBUF, "%c-Lined: %s", line, this->reason); + return true; +} + +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); if (*ServerInstance->Config->MoronBanner) - u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) - User::QuitUser(ServerInstance, u, line + std::string("-Lined"), reason); + ServerInstance->Users->QuitUser(u, line + "-Lined", sreason); else - User::QuitUser(ServerInstance, u, reason); + ServerInstance->Users->QuitUser(u, sreason); + + + if (bancache) + { + ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString()); + if (this->duration > 0) + ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration); + else + ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason); + } } bool KLine::Matches(User *u) @@ -422,9 +466,10 @@ bool KLine::Matches(User *u) if (u->exempt) return false; - if ((match(u->ident, this->identmask))) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -435,7 +480,7 @@ 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) @@ -443,9 +488,10 @@ bool GLine::Matches(User *u) if (u->exempt) return false; - if ((match(u->ident, this->identmask))) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -456,7 +502,7 @@ 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) @@ -464,9 +510,10 @@ bool ELine::Matches(User *u) if (u->exempt) return false; - if ((match(u->ident, this->identmask))) + if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map)) { - if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true))) + if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) || + InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map)) { return true; } @@ -480,7 +527,7 @@ bool ZLine::Matches(User *u) if (u->exempt) return false; - if (match(u->GetIPString(), this->ipaddr, true)) + if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr)) return true; else return false; @@ -488,16 +535,13 @@ bool ZLine::Matches(User *u) void ZLine::Apply(User* u) { - DefaultApply(u, 'Z'); + DefaultApply(u, "Z", true); } bool QLine::Matches(User *u) { - if (u->exempt) - return false; - - if (match(u->nick, this->nick)) + if (InspIRCd::Match(u->nick, this->nick)) return true; return false; @@ -505,14 +549,14 @@ bool QLine::Matches(User *u) 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.c_str()); } bool ZLine::Matches(const std::string &str) { - if (match(str.c_str(), this->ipaddr, true)) + if (InspIRCd::MatchCIDR(str, this->ipaddr)) return true; else return false; @@ -520,7 +564,7 @@ bool ZLine::Matches(const std::string &str) bool QLine::Matches(const std::string &str) { - if (match(str.c_str(), this->nick)) + if (InspIRCd::Match(str, this->nick)) return true; return false; @@ -528,48 +572,23 @@ bool QLine::Matches(const std::string &str) bool ELine::Matches(const std::string &str) { - return ((match(str.c_str(), matchtext.c_str(), true))); + return (InspIRCd::MatchCIDR(str, matchtext)); } bool KLine::Matches(const std::string &str) { - return ((match(str.c_str(), matchtext.c_str(), true))); + return (InspIRCd::MatchCIDR(str.c_str(), matchtext)); } bool GLine::Matches(const std::string &str) { - return ((match(str.c_str(), matchtext.c_str(), true))); -} - -bool ELine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == matchtext); -} - -bool ZLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == this->ipaddr); -} - -bool GLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == matchtext); -} - -bool KLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == matchtext); -} - -bool QLine::MatchesLiteral(const std::string &str) -{ - return (assign(str) == this->nick); + return (InspIRCd::MatchCIDR(str, matchtext)); } void ELine::OnAdd() { /* When adding one eline, only check the one eline */ - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + for (std::vector::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++) { User* u = (User*)(*u2); if (this->Matches(u)) @@ -579,27 +598,27 @@ void ELine::OnAdd() void ELine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); } void QLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration); } void ZLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration); } void KLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); } void GLine::DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration); } const char* ELine::Displayable() @@ -627,9 +646,14 @@ const char* QLine::Displayable() return nick; } +bool KLine::IsBurstable() +{ + return false; +} + bool XLineManager::RegisterFactory(XLineFactory* xlf) { - std::map::iterator n = line_factory.find(xlf->GetType()); + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); if (n != line_factory.end()) return false; @@ -641,7 +665,7 @@ bool XLineManager::RegisterFactory(XLineFactory* xlf) bool XLineManager::UnregisterFactory(XLineFactory* xlf) { - std::map::iterator n = line_factory.find(xlf->GetType()); + XLineFactMap::iterator n = line_factory.find(xlf->GetType()); if (n == line_factory.end()) return false; @@ -651,11 +675,11 @@ bool XLineManager::UnregisterFactory(XLineFactory* xlf) return true; } -XLineFactory* XLineManager::GetFactory(const char type) +XLineFactory* XLineManager::GetFactory(const std::string &type) { - std::map::iterator n = line_factory.find(type); + XLineFactMap::iterator n = line_factory.find(type); - if (n != line_factory.end()) + if (n == line_factory.end()) return NULL; return n->second;