X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=9b05a57f856aed3b7c4f1fd97cf0768e3f93bc72;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=7bb5ec1fb92da86a09e4ca3deff7522de04d606c;hpb=066e5ca3665835e50dddaaf612212ffb94c68a85;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 7bb5ec1fb..9b05a57f8 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,26 +2,20 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - #include "inspircd.h" #include "users.h" #include "modules.h" #include "wildcard.h" #include "xline.h" -#include "cull_list.h" /* Version two, now with optimized expiry! * @@ -32,7 +26,7 @@ using namespace std; * 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 + * (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 @@ -46,49 +40,63 @@ bool InitXLine(ServerConfig* conf, const char* tag) return true; } -bool DoneXLine(ServerConfig* conf, const char* tag) +bool DoneZLine(ServerConfig* conf, const char* tag) +{ + conf->GetInstance()->XLines->apply_lines(APPLY_ZLINES|APPLY_PERM_ONLY); + return true; +} + +bool DoneQLine(ServerConfig* conf, const char* tag) +{ + conf->GetInstance()->XLines->apply_lines(APPLY_QLINES|APPLY_PERM_ONLY); + return true; +} + +bool DoneKLine(ServerConfig* conf, const char* tag) +{ + conf->GetInstance()->XLines->apply_lines(APPLY_KLINES|APPLY_PERM_ONLY); + return true; +} + +bool DoneELine(ServerConfig* conf, const char* tag) { - conf->GetInstance()->XLines->apply_lines(APPLY_ALL); + /* Yes, this is supposed to do nothing, we dont 'apply' these */ return true; } -bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* ipmask = (char*)values[1]; - + const char* reason = values[0].GetString(); + const char* ipmask = values[1].GetString(); + conf->GetInstance()->XLines->add_zline(0,"",reason,ipmask); - conf->GetInstance()->Log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); return true; } -bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* nick = (char*)values[1]; - + const char* reason = values[0].GetString(); + const char* nick = values[1].GetString(); + conf->GetInstance()->XLines->add_qline(0,"",reason,nick); - conf->GetInstance()->Log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); return true; } -bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* host = (char*)values[1]; - + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); + conf->GetInstance()->XLines->add_kline(0,"",reason,host); - conf->GetInstance()->Log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); return true; } -bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) +bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types) { - char* reason = (char*)values[0]; - char* host = (char*)values[1]; - + const char* reason = values[0].GetString(); + const char* host = values[1].GetString(); + conf->GetInstance()->XLines->add_eline(0,"",reason,host); - conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); return true; } @@ -119,10 +127,11 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_gline(hostmask); - + if (del_gline(hostmask, true)) + return false; + GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); - + if (duration) { glines.push_back(item); @@ -132,8 +141,8 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso { pglines.push_back(item); } - - return !ret; + + return true; } // adds an e:line (exception to bans) @@ -142,7 +151,8 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_eline(hostmask); + if (del_eline(hostmask, true)) + return false; ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -155,14 +165,16 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas { pelines.push_back(item); } - return !ret; + return true; } // adds a q:line bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname) { - bool ret = del_qline(nickname); + if (del_qline(nickname, true)) + return false; + QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); if (duration) @@ -174,15 +186,13 @@ bool XLineManager::add_qline(long duration, const char* source, const char* reas { pqlines.push_back(item); } - return !ret; + return true; } // adds a z:line bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr) { - bool ret = del_zline(ipaddr); - if (strchr(ipaddr,'@')) { while (*ipaddr != '@') @@ -190,6 +200,9 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas ipaddr++; } + if (del_zline(ipaddr, true)) + return false; + ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); if (duration) @@ -201,7 +214,7 @@ bool XLineManager::add_zline(long duration, const char* source, const char* reas { pzlines.push_back(item); } - return !ret; + return true; } // adds a k:line @@ -210,7 +223,8 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas { IdentHostPair ih = IdentSplit(hostmask); - bool ret = del_kline(hostmask); + if (del_kline(hostmask, true)) + return false; KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); @@ -223,20 +237,23 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas { pklines.push_back(item); } - return !ret; + return true; } // deletes a g:line, returns true if the line existed and was removed -bool XLineManager::del_gline(const char* hostmask) +bool XLineManager::del_gline(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - glines.erase(i); + if (!simulate) + { + delete *i; + glines.erase(i); + } return true; } } @@ -244,8 +261,11 @@ bool XLineManager::del_gline(const char* hostmask) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - pglines.erase(i); + if (!simulate) + { + delete *i; + pglines.erase(i); + } return true; } } @@ -254,15 +274,18 @@ bool XLineManager::del_gline(const char* hostmask) // deletes a e:line, returns true if the line existed and was removed -bool XLineManager::del_eline(const char* hostmask) +bool XLineManager::del_eline(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - elines.erase(i); + if (!simulate) + { + delete *i; + elines.erase(i); + } return true; } } @@ -270,8 +293,11 @@ bool XLineManager::del_eline(const char* hostmask) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - pelines.erase(i); + if (!simulate) + { + delete *i; + pelines.erase(i); + } return true; } } @@ -280,14 +306,17 @@ bool XLineManager::del_eline(const char* hostmask) // deletes a q:line, returns true if the line existed and was removed -bool XLineManager::del_qline(const char* nickname) +bool XLineManager::del_qline(const char* nickname, bool simulate) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { if (!strcasecmp(nickname,(*i)->nick)) { - delete *i; - qlines.erase(i); + if (!simulate) + { + delete *i; + qlines.erase(i); + } return true; } } @@ -295,8 +324,11 @@ bool XLineManager::del_qline(const char* nickname) { if (!strcasecmp(nickname,(*i)->nick)) { - delete *i; - pqlines.erase(i); + if (!simulate) + { + delete *i; + pqlines.erase(i); + } return true; } } @@ -305,14 +337,17 @@ bool XLineManager::del_qline(const char* nickname) // deletes a z:line, returns true if the line existed and was removed -bool XLineManager::del_zline(const char* ipaddr) +bool XLineManager::del_zline(const char* ipaddr, bool simulate) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { if (!strcasecmp(ipaddr,(*i)->ipaddr)) { - delete *i; - zlines.erase(i); + if (!simulate) + { + delete *i; + zlines.erase(i); + } return true; } } @@ -320,8 +355,11 @@ bool XLineManager::del_zline(const char* ipaddr) { if (!strcasecmp(ipaddr,(*i)->ipaddr)) { - delete *i; - pzlines.erase(i); + if (!simulate) + { + delete *i; + pzlines.erase(i); + } return true; } } @@ -330,15 +368,18 @@ bool XLineManager::del_zline(const char* ipaddr) // deletes a k:line, returns true if the line existed and was removed -bool XLineManager::del_kline(const char* hostmask) +bool XLineManager::del_kline(const char* hostmask, bool simulate) { IdentHostPair ih = IdentSplit(hostmask); for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - klines.erase(i); + if (!simulate) + { + delete *i; + klines.erase(i); + } return true; } } @@ -346,8 +387,11 @@ bool XLineManager::del_kline(const char* hostmask) { if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { - delete *i; - pklines.erase(i); + if (!simulate) + { + delete *i; + pklines.erase(i); + } return true; } } @@ -356,32 +400,38 @@ bool XLineManager::del_kline(const char* hostmask) // returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match -char* XLineManager::matches_qline(const char* nick) +QLine* XLineManager::matches_qline(const char* nick, bool permonly) { if ((qlines.empty()) && (pqlines.empty())) return NULL; - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - if (match(nick,(*i)->nick)) - return (*i)->reason; + if (!permonly) + { + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + if (match(nick,(*i)->nick)) + return (*i); + } for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) if (match(nick,(*i)->nick)) - return (*i)->reason; + return (*i); return NULL; } // returns a pointer to the reason if a host matches a gline, NULL if it didnt match -char* XLineManager::matches_gline(userrec* user) +GLine* XLineManager::matches_gline(userrec* user, bool permonly) { if ((glines.empty()) && (pglines.empty())) return NULL; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + if (!permonly) { - if ((match(user->ident,(*i)->identmask))) + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { - if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + if ((match(user->ident,(*i)->identmask))) { - return (*i)->reason; + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } } } } @@ -391,26 +441,29 @@ char* XLineManager::matches_gline(userrec* user) { if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return (*i)->reason; + return (*i); } } } return NULL; } -char* XLineManager::matches_exception(userrec* user) -{ +ELine* XLineManager::matches_exception(userrec* user, bool permonly) +{ if ((elines.empty()) && (pelines.empty())) return NULL; char host2[MAXBUF]; snprintf(host2,MAXBUF,"*@%s",user->host); - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + if (!permonly) { - if ((match(user->ident,(*i)->identmask))) + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { - if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + if ((match(user->ident,(*i)->identmask))) { - return (*i)->reason; + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } } } } @@ -420,7 +473,7 @@ char* XLineManager::matches_exception(userrec* user) { if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return (*i)->reason; + return (*i); } } } @@ -435,6 +488,7 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time) if (!strcasecmp(host,(*i)->hostmask)) { (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } @@ -446,7 +500,7 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time) return; } } - return ; + return ; } void XLineManager::eline_set_creation_time(const char* host, time_t create_time) @@ -456,10 +510,11 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time) if (!strcasecmp(host,(*i)->hostmask)) { (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { if (!strcasecmp(host,(*i)->hostmask)) { @@ -477,6 +532,7 @@ void XLineManager::qline_set_creation_time(const char* nick, time_t create_time) if (!strcasecmp(nick,(*i)->nick)) { (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } @@ -498,6 +554,7 @@ void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) if (!strcasecmp(ip,(*i)->ipaddr)) { (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } @@ -514,32 +571,38 @@ void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) // returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match -char* XLineManager::matches_zline(const char* ipaddr) +ZLine* XLineManager::matches_zline(const char* ipaddr, bool permonly) { if ((zlines.empty()) && (pzlines.empty())) return NULL; - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - if (match(ipaddr,(*i)->ipaddr, true)) - return (*i)->reason; + if (!permonly) + { + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + if (match(ipaddr,(*i)->ipaddr, true)) + return (*i); + } for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) if (match(ipaddr,(*i)->ipaddr, true)) - return (*i)->reason; + return (*i); return NULL; } // returns a pointer to the reason if a host matches a kline, NULL if it didnt match -char* XLineManager::matches_kline(userrec* user) +KLine* XLineManager::matches_kline(userrec* user, bool permonly) { if ((klines.empty()) && (pklines.empty())) return NULL; - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + if (!permonly) { - if ((match(user->ident,(*i)->identmask))) + for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { - if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + if ((match(user->ident,(*i)->identmask))) { - return (*i)->reason; + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) + { + return (*i); + } } } } @@ -549,7 +612,7 @@ char* XLineManager::matches_kline(userrec* user) { if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return (*i)->reason; + return (*i); } } } @@ -558,27 +621,27 @@ char* XLineManager::matches_kline(userrec* user) bool XLineManager::GSortComparison ( const GLine* one, const GLine* two ) { - return (one->duration + one->set_time) < (two->duration + two->set_time); + return (one->expiry) < (two->expiry); } bool XLineManager::ESortComparison ( const ELine* one, const ELine* two ) { - return (one->duration + one->set_time) < (two->duration + two->set_time); + return (one->expiry) < (two->expiry); } bool XLineManager::ZSortComparison ( const ZLine* one, const ZLine* two ) { - return (one->duration + one->set_time) < (two->duration + two->set_time); + return (one->expiry) < (two->expiry); } bool XLineManager::KSortComparison ( const KLine* one, const KLine* two ) { - return (one->duration + one->set_time) < (two->duration + two->set_time); + return (one->expiry) < (two->expiry); } bool XLineManager::QSortComparison ( const QLine* one, const QLine* two ) { - return (one->duration + one->set_time) < (two->duration + two->set_time); + return (one->expiry) < (two->expiry); } // removes lines that have expired @@ -592,101 +655,196 @@ void XLineManager::expire_lines() * none left at the head of the queue that are after the current time. */ - while ((glines.size()) && (current > ((*glines.begin())->duration + (*glines.begin())->set_time))) + while ((glines.size()) && (current > (*glines.begin())->expiry)) { std::vector::iterator i = glines.begin(); - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s (set by %s %d seconds ago)",(*i)->hostmask,(*i)->source,(*i)->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration); glines.erase(i); } - while ((elines.size()) && (current > ((*elines.begin())->duration + (*elines.begin())->set_time))) + while ((elines.size()) && (current > (*elines.begin())->expiry)) { std::vector::iterator i = elines.begin(); - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s (set by %s %d seconds ago)",(*i)->hostmask,(*i)->source,(*i)->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration); elines.erase(i); } - while ((zlines.size()) && (current > ((*zlines.begin())->duration + (*zlines.begin())->set_time))) + while ((zlines.size()) && (current > (*zlines.begin())->expiry)) { std::vector::iterator i = zlines.begin(); ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",(*i)->ipaddr,(*i)->source,(*i)->duration); zlines.erase(i); } - while ((klines.size()) && (current > ((*klines.begin())->duration + (*klines.begin())->set_time))) + while ((klines.size()) && (current > (*klines.begin())->expiry)) { std::vector::iterator i = klines.begin(); - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s (set by %s %d seconds ago)",(*i)->hostmask,(*i)->source,(*i)->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",(*i)->identmask,(*i)->hostmask,(*i)->source,(*i)->duration); klines.erase(i); } - while ((qlines.size()) && (current > ((*qlines.begin())->duration + (*qlines.begin())->set_time))) + while ((qlines.size()) && (current > (*qlines.begin())->expiry)) { std::vector::iterator i = qlines.begin(); ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",(*i)->nick,(*i)->source,(*i)->duration); qlines.erase(i); } - + } // applies lines, removing clients and changing nicks etc as applicable void XLineManager::apply_lines(const int What) { - char reason[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && - (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) + if (!What) return; - CullList* Goners = new CullList(ServerInstance); - char* check = NULL; - for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) + if (What & APPLY_PERM_ONLY) { - userrec* u = (userrec*)(*u2); + char reason[MAXBUF]; - if (elines.size() || pelines.size()) - { - // ignore people matching exempts - if (matches_exception(u)) - continue; - } - if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) + if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) + return; + + XLine* check = NULL; + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - if ((check = matches_gline(u))) + userrec* u = (userrec*)(*u2); + + if (elines.size() || pelines.size()) + if (matches_exception(u)) + continue; + + if ((What & APPLY_GLINES) && pglines.size()) { - snprintf(reason,MAXBUF,"G-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_gline(u,true))) + { + snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } } - } - if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) - { - if ((check = matches_kline(u))) + + if ((What & APPLY_KLINES) && pklines.size()) { - snprintf(reason,MAXBUF,"K-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_kline(u,true))) + { + snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } } - } - if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) - { - if ((check = matches_qline(u->nick))) + + if ((What & APPLY_QLINES) && pqlines.size()) { - snprintf(reason,MAXBUF,"Q-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_qline(u->nick,true))) + { + snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } + } + + if ((What & APPLY_ZLINES) && pzlines.size()) + { + if ((check = matches_zline(u->GetIPString(),true))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } } } - if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + } + else + { + char reason[MAXBUF]; + + if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && + (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) + return; + + XLine* check = NULL; + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { - if ((check = matches_zline(u->GetIPString()))) + userrec* u = (userrec*)(*u2); + + if (elines.size() || pelines.size()) + { + // ignore people matching exempts + if (matches_exception(u)) + continue; + } + if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) + { + if ((check = matches_gline(u))) + { + snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "G-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } + } + if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) + { + if ((check = matches_kline(u))) + { + snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "K-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } + } + if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); - Goners->AddItem(u,reason); + if ((check = matches_qline(u->nick))) + { + snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "Q-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } + } + if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + { + if ((check = matches_zline(u->GetIPString()))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason); + if (*ServerInstance->Config->MoronBanner) + u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner); + if (ServerInstance->Config->HideBans) + ServerInstance->GlobalCulls.AddItem(u, "Z-Lined", reason); + else + ServerInstance->GlobalCulls.AddItem(u, reason); + } } } } - - Goners->Apply(); - DELETE(Goners); } void XLineManager::stats_k(userrec* user, string_list &results)