X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=746ad6388668de8e708559801290060427a5cc2f;hb=ed105d7fef72b5bb5f23e72fae40d6b4ffdcb5b8;hp=1c2ad77f986aaf4ced3a1fc58875a22e6b7de3a9;hpb=a9c93027da4901123f9170a654d7c9802c40ea65;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/xline.cpp b/src/xline.cpp index 1c2ad77f9..746ad6388 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -52,40 +52,40 @@ bool DoneXLine(ServerConfig* conf, const char* tag) 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); @@ -121,14 +121,7 @@ bool XLineManager::add_gline(long duration, const char* source,const char* reaso bool ret = del_gline(hostmask); - GLine item; - item.duration = duration; - strlcpy(item.identmask,ih.first.c_str(),19); - strlcpy(item.hostmask,ih.second.c_str(),199); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = ServerInstance->Time(); + GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); if (duration) { @@ -151,14 +144,8 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas bool ret = del_eline(hostmask); - ELine item; - item.duration = duration; - strlcpy(item.identmask,ih.first.c_str(),19); - strlcpy(item.hostmask,ih.second.c_str(),199); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = ServerInstance->Time(); + ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { elines.push_back(item); @@ -176,14 +163,8 @@ bool XLineManager::add_eline(long duration, const char* source, const char* reas bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname) { bool ret = del_qline(nickname); - QLine item; - item.duration = duration; - strlcpy(item.nick,nickname,63); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.is_global = false; - item.set_time = ServerInstance->Time(); + QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname); + if (duration) { qlines.push_back(item); @@ -201,20 +182,16 @@ bool XLineManager::add_qline(long duration, const char* source, const char* reas bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr) { bool ret = del_zline(ipaddr); - ZLine item; - item.duration = duration; + if (strchr(ipaddr,'@')) { while (*ipaddr != '@') ipaddr++; ipaddr++; } - strlcpy(item.ipaddr,ipaddr,39); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.is_global = false; - item.set_time = ServerInstance->Time(); + + ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr); + if (duration) { zlines.push_back(item); @@ -235,14 +212,8 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas bool ret = del_kline(hostmask); - KLine item; - item.duration = duration; - strlcpy(item.identmask,ih.first.c_str(),19); - strlcpy(item.hostmask,ih.second.c_str(),200); - strlcpy(item.reason,reason,MAXBUF); - strlcpy(item.source,source,255); - item.n_matches = 0; - item.set_time = ServerInstance->Time(); + KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str()); + if (duration) { klines.push_back(item); @@ -260,18 +231,20 @@ bool XLineManager::add_kline(long duration, const char* source, const char* reas bool XLineManager::del_gline(const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + 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)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; glines.erase(i); return true; } } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) { - if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; pglines.erase(i); return true; } @@ -284,18 +257,20 @@ bool XLineManager::del_gline(const char* hostmask) bool XLineManager::del_eline(const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + 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)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; elines.erase(i); return true; } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { - if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; pelines.erase(i); return true; } @@ -307,18 +282,20 @@ bool XLineManager::del_eline(const char* hostmask) bool XLineManager::del_qline(const char* nickname) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { - if (!strcasecmp(nickname,i->nick)) + if (!strcasecmp(nickname,(*i)->nick)) { + delete *i; qlines.erase(i); return true; } } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) { - if (!strcasecmp(nickname,i->nick)) + if (!strcasecmp(nickname,(*i)->nick)) { + delete *i; pqlines.erase(i); return true; } @@ -326,48 +303,24 @@ bool XLineManager::del_qline(const char* nickname) return false; } -bool XLineManager::qline_make_global(const char* nickname) -{ - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - { - if (!strcasecmp(nickname,i->nick)) - { - i->is_global = true; - return true; - } - } - return false; -} - -bool XLineManager::zline_make_global(const char* ipaddr) -{ - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - { - if (!strcasecmp(ipaddr,i->ipaddr)) - { - i->is_global = true; - return true; - } - } - return false; -} - // deletes a z:line, returns true if the line existed and was removed bool XLineManager::del_zline(const char* ipaddr) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { - if (!strcasecmp(ipaddr,i->ipaddr)) + if (!strcasecmp(ipaddr,(*i)->ipaddr)) { + delete *i; zlines.erase(i); return true; } } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) { - if (!strcasecmp(ipaddr,i->ipaddr)) + if (!strcasecmp(ipaddr,(*i)->ipaddr)) { + delete *i; pzlines.erase(i); return true; } @@ -380,18 +333,20 @@ bool XLineManager::del_zline(const char* ipaddr) bool XLineManager::del_kline(const char* hostmask) { IdentHostPair ih = IdentSplit(hostmask); - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + 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)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; klines.erase(i); return true; } } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) { - if (!strcasecmp(ih.first.c_str(),i->identmask) && !strcasecmp(ih.second.c_str(),i->hostmask)) + if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask)) { + delete *i; pklines.erase(i); return true; } @@ -401,71 +356,71 @@ 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) { 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; - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) - if (match(nick,i->nick)) - return i->reason; + 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); 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) { if ((glines.empty()) && (pglines.empty())) return NULL; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { - if ((match(user->ident,i->identmask))) + if ((match(user->ident,(*i)->identmask))) { - if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true))) + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return i->reason; + return (*i); } } } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) { - if ((match(user->ident,i->identmask))) + if ((match(user->ident,(*i)->identmask))) { - if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true))) + 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) { 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++) + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { - if ((match(user->ident,i->identmask))) + if ((match(user->ident,(*i)->identmask))) { - if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true))) + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return i->reason; + return (*i); } } } - for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) { - if ((match(user->ident,i->identmask))) + if ((match(user->ident,(*i)->identmask))) { - if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true))) + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return i->reason; + return (*i); } } } @@ -475,19 +430,20 @@ char* XLineManager::matches_exception(userrec* user) void XLineManager::gline_set_creation_time(const char* host, time_t create_time) { - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) + for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } - for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; return; } } @@ -496,19 +452,20 @@ void XLineManager::gline_set_creation_time(const char* host, time_t create_time) void XLineManager::eline_set_creation_time(const char* host, time_t create_time) { - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) + for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) { - if (!strcasecmp(host,i->hostmask)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*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)) + if (!strcasecmp(host,(*i)->hostmask)) { - i->set_time = create_time; + (*i)->set_time = create_time; return; } } @@ -517,19 +474,20 @@ void XLineManager::eline_set_creation_time(const char* host, time_t create_time) void XLineManager::qline_set_creation_time(const char* nick, time_t create_time) { - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) + for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) { - if (!strcasecmp(nick,i->nick)) + if (!strcasecmp(nick,(*i)->nick)) { - i->set_time = create_time; + (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } - for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) + for (std::vector::iterator i = pqlines.begin(); i != pqlines.end(); i++) { - if (!strcasecmp(nick,i->nick)) + if (!strcasecmp(nick,(*i)->nick)) { - i->set_time = create_time; + (*i)->set_time = create_time; return; } } @@ -538,19 +496,20 @@ void XLineManager::qline_set_creation_time(const char* nick, time_t create_time) void XLineManager::zline_set_creation_time(const char* ip, time_t create_time) { - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) + for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) { - if (!strcasecmp(ip,i->ipaddr)) + if (!strcasecmp(ip,(*i)->ipaddr)) { - i->set_time = create_time; + (*i)->set_time = create_time; + (*i)->expiry = create_time + (*i)->duration; return; } } - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) + for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) { - if (!strcasecmp(ip,i->ipaddr)) + if (!strcasecmp(ip,(*i)->ipaddr)) { - i->set_time = create_time; + (*i)->set_time = create_time; return; } } @@ -559,71 +518,71 @@ 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) { 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; - for (std::vector::iterator i = pzlines.begin(); i != pzlines.end(); i++) - if (match(ipaddr,i->ipaddr, true)) - return i->reason; + 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); 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) { if ((klines.empty()) && (pklines.empty())) return NULL; - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) + for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) { - if ((match(user->ident,i->identmask))) + if ((match(user->ident,(*i)->identmask))) { - if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true))) + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return i->reason; + return (*i); } } } - for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) { - if ((match(user->ident,i->identmask))) + if ((match(user->ident,(*i)->identmask))) { - if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true))) + if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true))) { - return i->reason; + return (*i); } } } return NULL; } -bool XLineManager::GSortComparison ( const GLine one, const GLine two ) +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 ) +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 ) +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 ) +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 ) +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 @@ -632,43 +591,43 @@ void XLineManager::expire_lines() { time_t current = ServerInstance->Time(); - /* Because we now store all our XLines in sorted order using (i->duration + i->set_time) as a key, this + /* 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. */ - 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); + std::vector::iterator i = glines.begin(); + 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); + std::vector::iterator i = elines.begin(); + 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); + 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); + std::vector::iterator i = klines.begin(); + 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); + 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); } @@ -679,18 +638,17 @@ void XLineManager::expire_lines() void XLineManager::apply_lines(const int What) { char reason[MAXBUF]; - char host[MAXBUF]; if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) && (!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size())) return; CullList* Goners = new CullList(ServerInstance); - char* check = NULL; + XLine* check = NULL; for (std::vector::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++) { userrec* u = (userrec*)(*u2); - u->MakeHost(host); + if (elines.size() || pelines.size()) { // ignore people matching exempts @@ -701,7 +659,7 @@ void XLineManager::apply_lines(const int What) { if ((check = matches_gline(u))) { - snprintf(reason,MAXBUF,"G-Lined: %s",check); + snprintf(reason,MAXBUF,"G-Lined: %s",check->reason); Goners->AddItem(u,reason); } } @@ -709,7 +667,7 @@ void XLineManager::apply_lines(const int What) { if ((check = matches_kline(u))) { - snprintf(reason,MAXBUF,"K-Lined: %s",check); + snprintf(reason,MAXBUF,"K-Lined: %s",check->reason); Goners->AddItem(u,reason); } } @@ -717,7 +675,7 @@ void XLineManager::apply_lines(const int What) { if ((check = matches_qline(u->nick))) { - snprintf(reason,MAXBUF,"Q-Lined: %s",check); + snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason); Goners->AddItem(u,reason); } } @@ -725,7 +683,7 @@ void XLineManager::apply_lines(const int What) { if ((check = matches_zline(u->GetIPString()))) { - snprintf(reason,MAXBUF,"Z-Lined: %s",check); + snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason); Goners->AddItem(u,reason); } } @@ -738,46 +696,46 @@ void XLineManager::apply_lines(const int What) void XLineManager::stats_k(userrec* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = klines.begin(); i != klines.end(); i++) - 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++) - 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 = klines.begin(); i != klines.end(); i++) + results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pklines.begin(); i != pklines.end(); i++) + results.push_back(sn+" 216 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } void XLineManager::stats_g(userrec* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = glines.begin(); i != glines.end(); i++) - 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++) - 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 = glines.begin(); i != glines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pglines.begin(); i != pglines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } void XLineManager::stats_q(userrec* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = qlines.begin(); i != qlines.end(); i++) - 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++) - 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 = qlines.begin(); i != qlines.end(); i++) + 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++) + results.push_back(sn+" 217 "+user->nick+" :"+(*i)->nick+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } void XLineManager::stats_z(userrec* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = zlines.begin(); i != zlines.end(); i++) - 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++) - 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 = zlines.begin(); i != zlines.end(); i++) + 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++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->ipaddr+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } void XLineManager::stats_e(userrec* user, string_list &results) { std::string sn = ServerInstance->Config->ServerName; - for (std::vector::iterator i = elines.begin(); i != elines.end(); i++) - 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++) - 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 = elines.begin(); i != elines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); + for (std::vector::iterator i = pelines.begin(); i != pelines.end(); i++) + results.push_back(sn+" 223 "+user->nick+" :"+(*i)->identmask+"@"+(*i)->hostmask+" "+ConvToStr((*i)->set_time)+" "+ConvToStr((*i)->duration)+" "+(*i)->source+" :"+(*i)->reason); } XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)