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,"<Config>",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,"<Config>",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,"<Config>",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,"<Config>",reason,host);
conf->GetInstance()->Log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
return true;
}
+IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
+{
+ IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
+ std::string::size_type x = ident_and_host.find('@');
+ if (x != std::string::npos)
+ {
+ n.second = ident_and_host.substr(x + 1,ident_and_host.length());
+ n.first = ident_and_host.substr(0, x);
+ if (!n.first.length())
+ n.first = "*";
+ if (!n.second.length())
+ n.second = "*";
+ }
+ else
+ {
+ n.second = ident_and_host;
+ }
+
+ return n;
+}
+
// adds a g:line
bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
+
bool ret = del_gline(hostmask);
- GLine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,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)
{
bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
+
bool ret = del_eline(hostmask);
- ELine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,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);
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);
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);
bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
+ IdentHostPair ih = IdentSplit(hostmask);
+
bool ret = del_kline(hostmask);
- KLine item;
- item.duration = duration;
- strlcpy(item.hostmask,hostmask,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);
bool XLineManager::del_gline(const char* hostmask)
{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
+ IdentHostPair ih = IdentSplit(hostmask);
+ for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
{
- if (!strcasecmp(hostmask,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<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
+ delete *i;
pglines.erase(i);
return true;
}
bool XLineManager::del_eline(const char* hostmask)
{
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ IdentHostPair ih = IdentSplit(hostmask);
+ for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
{
- if (!strcasecmp(hostmask,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<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
+ delete *i;
pelines.erase(i);
return true;
}
bool XLineManager::del_qline(const char* nickname)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ for (std::vector<QLine*>::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<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ for (std::vector<QLine*>::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;
}
return false;
}
-bool XLineManager::qline_make_global(const char* nickname)
-{
- for (std::vector<QLine>::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<ZLine>::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<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ for (std::vector<ZLine*>::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<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ for (std::vector<ZLine*>::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;
}
bool XLineManager::del_kline(const char* hostmask)
{
- for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
+ IdentHostPair ih = IdentSplit(hostmask);
+ for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
{
- if (!strcasecmp(hostmask,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<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
{
- if (!strcasecmp(hostmask,i->hostmask))
+ if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
+ delete *i;
pklines.erase(i);
return true;
}
// 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<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
- if (match(nick,i->nick))
- return i->reason;
- for (std::vector<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
- if (match(nick,i->nick))
- return i->reason;
+ for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ if (match(nick,(*i)->nick))
+ return (*i);
+ for (std::vector<QLine*>::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<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
- if (match(user->host,i->hostmask, true) || (match(user->GetIPString(),i->hostmask, true)))
- return i->reason;
- for (std::vector<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
- if (match(user->host,i->hostmask, true) || (match(user->GetIPString(),i->hostmask, true)))
- return i->reason;
+ for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
+ {
+ if ((match(user->ident,(*i)->identmask)))
+ {
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
+ }
+ }
+ for (std::vector<GLine*>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ {
+ if ((match(user->ident,(*i)->identmask)))
+ {
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ 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<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
- if ((match(user->host,i->hostmask)) || (match(host2,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
- return i->reason;
- for (std::vector<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
- if ((match(user->host,i->hostmask)) || (match(host2,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
- return i->reason;
+ for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
+ {
+ if ((match(user->ident,(*i)->identmask)))
+ {
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
+ }
+ }
+ for (std::vector<ELine*>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ {
+ if ((match(user->ident,(*i)->identmask)))
+ {
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
+ }
+ }
return NULL;
}
void XLineManager::gline_set_creation_time(const char* host, time_t create_time)
{
- for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
+ for (std::vector<GLine*>::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<GLine>::iterator i = pglines.begin(); i != pglines.end(); i++)
+ for (std::vector<GLine*>::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;
}
}
void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
{
- for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
+ for (std::vector<ELine*>::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<ELine>::iterator i = pelines.begin(); i != pelines.end(); i++)
+ for (std::vector<ELine*>::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;
}
}
void XLineManager::qline_set_creation_time(const char* nick, time_t create_time)
{
- for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
+ for (std::vector<QLine*>::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<QLine>::iterator i = pqlines.begin(); i != pqlines.end(); i++)
+ for (std::vector<QLine*>::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;
}
}
void XLineManager::zline_set_creation_time(const char* ip, time_t create_time)
{
- for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ for (std::vector<ZLine*>::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<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
+ for (std::vector<ZLine*>::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;
}
}
// 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<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
- if (match(ipaddr,i->ipaddr, true))
- return i->reason;
- for (std::vector<ZLine>::iterator i = pzlines.begin(); i != pzlines.end(); i++)
- if (match(ipaddr,i->ipaddr, true))
- return i->reason;
+ for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
+ if (match(ipaddr,(*i)->ipaddr, true))
+ return (*i);
+ for (std::vector<ZLine*>::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<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
- if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
- return i->reason;
- for (std::vector<KLine>::iterator i = pklines.begin(); i != pklines.end(); i++)
- if ((match(user->host,i->hostmask, true)) || (match(user->GetIPString(),i->hostmask, true)))
- return i->reason;
+ for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
+ {
+ if ((match(user->ident,(*i)->identmask)))
+ {
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ return (*i);
+ }
+ }
+ }
+ for (std::vector<KLine*>::iterator i = pklines.begin(); i != pklines.end(); i++)
+ {
+ if ((match(user->ident,(*i)->identmask)))
+ {
+ if ((match(user->host,(*i)->hostmask, true)) || (match(user->GetIPString(),(*i)->hostmask, true)))
+ {
+ 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
{
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<GLine>::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<GLine*>::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<ELine>::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<ELine*>::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<ZLine>::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<ZLine*>::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<KLine>::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<KLine*>::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<QLine>::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<QLine*>::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);
}
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<userrec*>::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
{
if ((check = matches_gline(u)))
{
- snprintf(reason,MAXBUF,"G-Lined: %s",check);
+ snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
Goners->AddItem(u,reason);
}
}
{
if ((check = matches_kline(u)))
{
- snprintf(reason,MAXBUF,"K-Lined: %s",check);
+ snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
Goners->AddItem(u,reason);
}
}
{
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);
}
}
{
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);
}
}
void XLineManager::stats_k(userrec* user, string_list &results)
{
std::string sn = ServerInstance->Config->ServerName;
- for (std::vector<KLine>::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<KLine>::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<KLine*>::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<KLine*>::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<GLine>::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<GLine>::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<GLine*>::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<GLine*>::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<QLine>::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<QLine>::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<QLine*>::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<QLine*>::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<ZLine>::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<ZLine>::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<ZLine*>::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<ZLine*>::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<ELine>::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<ELine>::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<ELine*>::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<ELine*>::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)
projects / user / henk / code / inspircd.git / blobdiff