X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=d3821b528147c2a66b05c43782823d4064379c41;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=0443a4f17d56c19f394596a1fa6f587a0ddc31e9;hpb=5d407fb44c759524881712a80febb86b4506ddbf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 0443a4f17..d3821b528 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -36,16 +36,14 @@ using namespace std; #include "helperfuncs.h" #include "hashcomp.h" #include "typedefs.h" +#include "configreader.h" #include "cull_list.h" -extern ServerConfig *Config; +extern InspIRCd* ServerInstance; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; -extern ServerConfig* Config; -extern user_hash clientlist; -extern std::vector local_users; /* Version two, now with optimized expiry! * @@ -53,8 +51,8 @@ extern std::vector local_users; * 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 permenant items (ones which will expire). - * Items which are on the permenant list are NEVER checked at all by the + * 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 @@ -97,18 +95,18 @@ bool KSortComparison ( const KLine one, const KLine two ); // this way these days, such as qlines against // services nicks, etc. -bool InitXLine(const char* tag) +bool InitXLine(ServerConfig* conf, const char* tag) { return true; } -bool DoneXLine(const char* tag) +bool DoneXLine(ServerConfig* conf, const char* tag) { apply_lines(APPLY_ALL); return true; } -bool DoZLine(const char* tag, char** entries, void** values, int* types) +bool DoZLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) { char* reason = (char*)values[0]; char* ipmask = (char*)values[1]; @@ -118,7 +116,7 @@ bool DoZLine(const char* tag, char** entries, void** values, int* types) return true; } -bool DoQLine(const char* tag, char** entries, void** values, int* types) +bool DoQLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) { char* reason = (char*)values[0]; char* nick = (char*)values[1]; @@ -128,7 +126,7 @@ bool DoQLine(const char* tag, char** entries, void** values, int* types) return true; } -bool DoKLine(const char* tag, char** entries, void** values, int* types) +bool DoKLine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) { char* reason = (char*)values[0]; char* host = (char*)values[1]; @@ -138,7 +136,7 @@ bool DoKLine(const char* tag, char** entries, void** values, int* types) return true; } -bool DoELine(const char* tag, char** entries, void** values, int* types) +bool DoELine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types) { char* reason = (char*)values[0]; char* host = (char*)values[1]; @@ -442,10 +440,10 @@ char* matches_gline(const char* host) if ((glines.empty()) && (pglines.empty())) return NULL; for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; return NULL; } @@ -457,16 +455,16 @@ char* matches_exception(const char* host) char host2[MAXBUF]; snprintf(host2,MAXBUF,"*@%s",host); for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - if ((match(host,i->hostmask)) || (match(host2,i->hostmask))) + if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true))) return i->reason; for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) - if ((match(host,i->hostmask)) || (match(host2,i->hostmask))) + if ((match(host,i->hostmask)) || (match(host2,i->hostmask, true))) return i->reason; return NULL; } -void gline_set_creation_time(char* host, time_t create_time) +void gline_set_creation_time(const char* host, time_t create_time) { for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { @@ -487,7 +485,7 @@ void gline_set_creation_time(char* host, time_t create_time) return ; } -void eline_set_creation_time(char* host, time_t create_time) +void eline_set_creation_time(const char* host, time_t create_time) { for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { @@ -508,7 +506,7 @@ void eline_set_creation_time(char* host, time_t create_time) return; } -void qline_set_creation_time(char* nick, time_t create_time) +void qline_set_creation_time(const char* nick, time_t create_time) { for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { @@ -529,7 +527,7 @@ void qline_set_creation_time(char* nick, time_t create_time) return; } -void zline_set_creation_time(char* ip, time_t create_time) +void zline_set_creation_time(const char* ip, time_t create_time) { for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { @@ -557,10 +555,10 @@ char* matches_zline(const char* ipaddr) if ((zlines.empty()) && (pzlines.empty())) return NULL; for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - if (match(ipaddr,i->ipaddr)) + if (match(ipaddr,i->ipaddr, true)) return i->reason; for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - if (match(ipaddr,i->ipaddr)) + if (match(ipaddr,i->ipaddr, true)) return i->reason; return NULL; } @@ -572,10 +570,10 @@ char* matches_kline(const char* host) if ((klines.empty()) && (pklines.empty())) return NULL; for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - if (match(host,i->hostmask)) + if (match(host,i->hostmask, true)) return i->reason; return NULL; } @@ -666,7 +664,7 @@ void apply_lines(const int What) CullList* Goners = new CullList(); char* check = NULL; - for (std::vector::const_iterator u2 = local_users.begin(); u2 != local_users.end(); u2++) + for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { userrec* u = (userrec*)(*u2); u->MakeHost(host); @@ -702,7 +700,7 @@ void apply_lines(const int What) } if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size())) { - if ((check = matches_zline((char*)inet_ntoa(u->ip4)))) + if ((check = matches_zline(u->GetIPString()))) { snprintf(reason,MAXBUF,"Z-Lined: %s",check); Goners->AddItem(u,reason); @@ -714,42 +712,47 @@ void apply_lines(const int What) DELETE(Goners); } -void stats_k(userrec* user) +void stats_k(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) - WriteServ(user->fd,"216 %s :%s %d %d %s :%s",user->nick,i->hostmask,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 216 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_g(userrec* user) +void stats_g(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = glines.begin(); i != glines.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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pglines.begin(); i != pglines.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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_q(userrec* user) +void stats_q(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - WriteServ(user->fd,"217 %s :%s %d %d %s :%s",user->nick,i->nick,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 217 "+user->nick+" :"+i->nick+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_z(userrec* user) +void stats_z(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - WriteServ(user->fd,"223 %s :%s %d %d %s :%s",user->nick,i->ipaddr,i->set_time,i->duration,i->source,i->reason); + results.push_back(sn+" 223 "+user->nick+" :"+i->ipaddr+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); } -void stats_e(userrec* user) +void stats_e(userrec* user, string_list &results) { + std::string sn = ServerInstance->Config->ServerName; for (std::vector::iterator i = elines.begin(); i != elines.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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); 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); + results.push_back(sn+" 223 "+user->nick+" :"+i->hostmask+" "+ConvToStr(i->set_time)+" "+ConvToStr(i->duration)+" "+i->source+" :"+i->reason); }