X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=accb5ce9f7f8b084ff018d4711b5448cd3b565ad;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=434aaeeb1b4c9d88de87f5e342806f632fa73862;hpb=dec44e09b85c9c5bd1e87b1f9607429f046a1e64;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 434aaeeb1..accb5ce9f 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -19,7 +19,6 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" -#include "inspircd_util.h" #include #include #include @@ -46,59 +45,17 @@ using namespace std; #include "inspstring.h" #include "helperfuncs.h" #include "hashcomp.h" +#include "typedefs.h" +#include "cull_list.h" + +extern ServerConfig *Config; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; - -extern int LogLevel; -extern char ServerName[MAXBUF]; -extern char Network[MAXBUF]; -extern char ServerDesc[MAXBUF]; -extern char AdminName[MAXBUF]; -extern char AdminEmail[MAXBUF]; -extern char AdminNick[MAXBUF]; -extern char diepass[MAXBUF]; -extern char restartpass[MAXBUF]; -extern char motd[MAXBUF]; -extern char rules[MAXBUF]; -extern char list[MAXBUF]; -extern char PrefixQuit[MAXBUF]; -extern char DieValue[MAXBUF]; - -extern int debugging; -extern int WHOWAS_STALE; -extern int WHOWAS_MAX; -extern int DieDelay; -extern time_t startup_time; -extern int NetBufferSize; -extern time_t nb_start; - -extern std::vector module_names; - -extern int boundPortCount; -extern int portCount; - -extern int ports[MAXSOCKS]; - -extern std::stringstream config_f; - -extern FILE *log_file; - -typedef nspace::hash_map, irc::StrHashComp> user_hash; -typedef nspace::hash_map, irc::StrHashComp> chan_hash; -typedef nspace::hash_map, irc::InAddr_HashComp> address_cache; -typedef nspace::hash_map, irc::StrHashComp> whowas_hash; -typedef std::deque command_table; - - +extern ServerConfig* Config; extern user_hash clientlist; -extern chan_hash chanlist; -extern whowas_hash whowas; -extern command_table cmdlist; -extern file_cache MOTD; -extern file_cache RULES; -extern address_cache IP; +extern std::vector local_users; /* Version two, now with optimized expiry! * @@ -157,33 +114,33 @@ void read_xline_defaults() char host[MAXBUF]; char reason[MAXBUF]; - for (int i = 0; i < ConfValueEnum("badip",&config_f); i++) + for (int i = 0; i < Config->ConfValueEnum("badip",&Config->config_f); i++) { - ConfValue("badip","ipmask",i,ipmask,&config_f); - ConfValue("badip","reason",i,reason,&config_f); + Config->ConfValue("badip","ipmask",i,ipmask,&Config->config_f); + Config->ConfValue("badip","reason",i,reason,&Config->config_f); add_zline(0,"",reason,ipmask); log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason); } - for (int i = 0; i < ConfValueEnum("badnick",&config_f); i++) + for (int i = 0; i < Config->ConfValueEnum("badnick",&Config->config_f); i++) { - ConfValue("badnick","nick",i,nick,&config_f); - ConfValue("badnick","reason",i,reason,&config_f); + Config->ConfValue("badnick","nick",i,nick,&Config->config_f); + Config->ConfValue("badnick","reason",i,reason,&Config->config_f); add_qline(0,"",reason,nick); log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason); } - for (int i = 0; i < ConfValueEnum("badhost",&config_f); i++) + for (int i = 0; i < Config->ConfValueEnum("badhost",&Config->config_f); i++) { - ConfValue("badhost","host",i,host,&config_f); - ConfValue("badhost","reason",i,reason,&config_f); + Config->ConfValue("badhost","host",i,host,&Config->config_f); + Config->ConfValue("badhost","reason",i,reason,&Config->config_f); add_kline(0,"",reason,host); log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason); } - for (int i = 0; i < ConfValueEnum("exception",&config_f); i++) + for (int i = 0; i < Config->ConfValueEnum("exception",&Config->config_f); i++) { - ConfValue("exception","host",i,host,&config_f); - ConfValue("exception","reason",i,reason,&config_f); + Config->ConfValue("exception","host",i,host,&Config->config_f); + Config->ConfValue("exception","reason",i,reason,&Config->config_f); add_eline(0,"",reason,host); log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason); } @@ -191,9 +148,9 @@ void read_xline_defaults() // adds a g:line -void add_gline(long duration, const char* source,const char* reason,const char* hostmask) +bool add_gline(long duration, const char* source,const char* reason,const char* hostmask) { - del_gline(hostmask); + bool ret = del_gline(hostmask); GLine item; item.duration = duration; strlcpy(item.hostmask,hostmask,199); @@ -210,13 +167,14 @@ void add_gline(long duration, const char* source,const char* reason,const char* { pglines.push_back(item); } + return !ret; } // adds an e:line (exception to bans) -void add_eline(long duration, const char* source, const char* reason, const char* hostmask) +bool add_eline(long duration, const char* source, const char* reason, const char* hostmask) { - del_eline(hostmask); + bool ret = del_eline(hostmask); ELine item; item.duration = duration; strlcpy(item.hostmask,hostmask,199); @@ -233,13 +191,14 @@ void add_eline(long duration, const char* source, const char* reason, const char { pelines.push_back(item); } + return !ret; } // adds a q:line -void add_qline(long duration, const char* source, const char* reason, const char* nickname) +bool add_qline(long duration, const char* source, const char* reason, const char* nickname) { - del_qline(nickname); + bool ret = del_qline(nickname); QLine item; item.duration = duration; strlcpy(item.nick,nickname,63); @@ -257,13 +216,14 @@ void add_qline(long duration, const char* source, const char* reason, const char { pqlines.push_back(item); } + return !ret; } // adds a z:line -void add_zline(long duration, const char* source, const char* reason, const char* ipaddr) +bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr) { - del_zline(ipaddr); + bool ret = del_zline(ipaddr); ZLine item; item.duration = duration; if (strchr(ipaddr,'@')) @@ -287,13 +247,14 @@ void add_zline(long duration, const char* source, const char* reason, const char { pzlines.push_back(item); } + return !ret; } // adds a k:line -void add_kline(long duration, const char* source, const char* reason, const char* hostmask) +bool add_kline(long duration, const char* source, const char* reason, const char* hostmask) { - del_kline(hostmask); + bool ret = del_kline(hostmask); KLine item; item.duration = duration; strlcpy(item.hostmask,hostmask,200); @@ -310,6 +271,7 @@ void add_kline(long duration, const char* source, const char* reason, const char { pklines.push_back(item); } + return !ret; } // deletes a g:line, returns true if the line existed and was removed @@ -457,7 +419,7 @@ bool del_kline(const char* hostmask) char* matches_qline(const char* nick) { - if (qlines.empty()) + if ((qlines.empty()) && (pqlines.empty())) return NULL; for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) if (match(nick,i->nick)) @@ -472,7 +434,7 @@ char* matches_qline(const char* nick) char* matches_gline(const char* host) { - if (glines.empty()) + if ((glines.empty()) && (pglines.empty())) return NULL; for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) if (match(host,i->hostmask)) @@ -485,7 +447,7 @@ char* matches_gline(const char* host) char* matches_exception(const char* host) { - if (elines.empty()) + if ((elines.empty()) && (pelines.empty())) return NULL; char host2[MAXBUF]; snprintf(host2,MAXBUF,"*@%s",host); @@ -587,7 +549,7 @@ void zline_set_creation_time(char* ip, time_t create_time) char* matches_zline(const char* ipaddr) { - if (zlines.empty()) + if ((zlines.empty()) && (pzlines.empty())) return NULL; for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) if (match(ipaddr,i->ipaddr)) @@ -602,7 +564,7 @@ char* matches_zline(const char* ipaddr) char* matches_kline(const char* host) { - if (klines.empty()) + if ((klines.empty()) && (pklines.empty())) return NULL; for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) if (match(host,i->hostmask)) @@ -688,80 +650,63 @@ void expire_lines() // applies lines, removing clients and changing nicks etc as applicable -void apply_lines() +void apply_lines(const int What) { - bool go_again = true; char reason[MAXBUF]; char host[MAXBUF]; - - if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size())) + + if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && + (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) return; - - while (go_again) + + CullList* Goners = new CullList(); + char* check = NULL; + for (std::vector::const_iterator u2 = local_users.begin(); u2 != local_users.end(); u2++) { - go_again = false; - for (user_hash::const_iterator u = clientlist.begin(); u != clientlist.end(); u++) + userrec* u = (userrec*)(*u2); + u->MakeHost(host); + if (elines.size() || pelines.size()) { - if (u->second->server > -1) + // ignore people matching exempts + if (matches_exception(host)) + continue; + } + if ((What & APPLY_GLINES) && (glines.size() || pglines.size())) + { + if ((check = matches_gline(host))) + { + snprintf(reason,MAXBUF,"G-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_KLINES) && (klines.size() || pklines.size())) + { + if ((check = matches_kline(host))) { - snprintf(host,MAXBUF,"%s@%s",u->second->ident,u->second->host); - if (elines.size()) - { - // ignore people matching exempts - if (matches_exception(host)) - continue; - } - if (glines.size() || pglines.size()) - { - char* check = matches_gline(host); - if (check) - { - WriteOpers("*** User %s matches G-Line: %s",u->second->registered == 7 ? u->second->nick:"",check); - snprintf(reason,MAXBUF,"G-Lined: %s",check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - if (klines.size() || pklines.size()) - { - char* check = matches_kline(host); - if (check) - { - WriteOpers("*** User %s matches K-Line: %s",u->second->registered == 7 ? u->second->nick:"",check); - snprintf(reason,MAXBUF,"K-Lined: %s",check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - if (qlines.size() || pqlines.size()) - { - char* check = matches_qline(u->second->nick); - if (check) - { - snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check); - WriteOpers("*** Q-Lined nickname %s from %s: %s",u->second->registered == 7 ? u->second->nick:"",u->second->host,check); - kill_link(u->second,reason); - go_again = true; - break; - } - } - if (zlines.size() || pzlines.size()) - { - char* check = matches_zline(u->second->ip); - if (check) - { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); - WriteOpers("*** User %s matches Z-Line: %s",u->second->registered == 7 ? u->second->nick:"",u->second->host,check); - kill_link(u->second,reason); - go_again = true; - break; - } - } + snprintf(reason,MAXBUF,"K-Lined: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size())) + { + if ((check = matches_qline(u->nick))) + { + snprintf(reason,MAXBUF,"Matched Q-Lined nick: %s",check); + Goners->AddItem(u,reason); + } + } + if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) + { + if ((check = matches_zline((char*)inet_ntoa(u->ip4)))) + { + snprintf(reason,MAXBUF,"Z-Lined: %s",check); + Goners->AddItem(u,reason); } } } + + Goners->Apply(); + delete Goners; } void stats_k(userrec* user) @@ -803,3 +748,4 @@ void stats_e(userrec* user) for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) WriteServ(user->fd,"223 %s :%s %d %d %s %s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); } +