using namespace std;
-#include "inspircd_config.h"
#include "inspircd.h"
-#include <string>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
#include "users.h"
-#include "ctables.h"
-#include "globals.h"
#include "modules.h"
-#include "dynamic.h"
#include "wildcard.h"
-#include "commands.h"
#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "configreader.h"
#include "cull_list.h"
-extern InspIRCd* ServerInstance;
-
/* Version two, now with optimized expiry!
*
* Because the old way was horrendously slow, the new way of expiring xlines is very
* -- Brain
*/
-
-
-extern time_t TIME;
-
-/* Lists for temporary lines with an expiry time */
-
-std::vector<KLine> klines;
-std::vector<GLine> glines;
-std::vector<ZLine> zlines;
-std::vector<QLine> qlines;
-std::vector<ELine> elines;
-
-/* Seperate lists for perm XLines that isnt checked by expiry functions */
-
-std::vector<KLine> pklines;
-std::vector<GLine> pglines;
-std::vector<ZLine> pzlines;
-std::vector<QLine> pqlines;
-std::vector<ELine> pelines;
-
-
-bool GSortComparison ( const GLine one, const GLine two );
-bool ZSortComparison ( const ZLine one, const ZLine two );
-bool ESortComparison ( const ELine one, const ELine two );
-bool QSortComparison ( const QLine one, const QLine two );
-bool KSortComparison ( const KLine one, const KLine two );
-
-// Reads the default bans from the config file.
-// only a very small number of bans are defined
-// this way these days, such as qlines against
-// services nicks, etc.
-
bool InitXLine(ServerConfig* conf, const char* tag)
{
return true;
bool DoneXLine(ServerConfig* conf, const char* tag)
{
- apply_lines(APPLY_ALL);
+ conf->GetInstance()->XLines->apply_lines(APPLY_ALL);
return true;
}
char* reason = (char*)values[0];
char* ipmask = (char*)values[1];
- add_zline(0,"<Config>",reason,ipmask);
- log(DEBUG,"Read Z line (badip tag): ipmask=%s reason=%s",ipmask,reason);
+ 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;
}
char* reason = (char*)values[0];
char* nick = (char*)values[1];
- add_qline(0,"<Config>",reason,nick);
- log(DEBUG,"Read Q line (badnick tag): nick=%s reason=%s",nick,reason);
+ 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;
}
char* reason = (char*)values[0];
char* host = (char*)values[1];
- add_kline(0,"<Config>",reason,host);
- log(DEBUG,"Read K line (badhost tag): host=%s reason=%s",host,reason);
+ 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;
}
char* reason = (char*)values[0];
char* host = (char*)values[1];
- add_eline(0,"<Config>",reason,host);
- log(DEBUG,"Read E line (exception tag): host=%s reason=%s",host,reason);
+ 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;
}
// adds a g:line
-bool add_gline(long duration, const char* source,const char* reason,const char* hostmask)
+bool XLineManager::add_gline(long duration, const char* source,const char* reason,const char* hostmask)
{
bool ret = del_gline(hostmask);
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,255);
item.n_matches = 0;
- item.set_time = TIME;
+ item.set_time = ServerInstance->Time();
if (duration)
{
glines.push_back(item);
- sort(glines.begin(), glines.end(),GSortComparison);
+ sort(glines.begin(), glines.end(),XLineManager::GSortComparison);
}
else
{
// adds an e:line (exception to bans)
-bool add_eline(long duration, const char* source, const char* reason, const char* hostmask)
+bool XLineManager::add_eline(long duration, const char* source, const char* reason, const char* hostmask)
{
bool ret = del_eline(hostmask);
ELine item;
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,255);
item.n_matches = 0;
- item.set_time = TIME;
+ item.set_time = ServerInstance->Time();
if (duration)
{
elines.push_back(item);
- sort(elines.begin(), elines.end(),ESortComparison);
+ sort(elines.begin(), elines.end(),XLineManager::ESortComparison);
}
else
{
// adds a q:line
-bool add_qline(long duration, const char* source, const char* reason, const char* nickname)
+bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)
{
bool ret = del_qline(nickname);
QLine item;
strlcpy(item.source,source,255);
item.n_matches = 0;
item.is_global = false;
- item.set_time = TIME;
+ item.set_time = ServerInstance->Time();
if (duration)
{
qlines.push_back(item);
- sort(qlines.begin(), qlines.end(),QSortComparison);
+ sort(qlines.begin(), qlines.end(),XLineManager::QSortComparison);
}
else
{
// adds a z:line
-bool add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
+bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
{
bool ret = del_zline(ipaddr);
ZLine item;
strlcpy(item.source,source,255);
item.n_matches = 0;
item.is_global = false;
- item.set_time = TIME;
+ item.set_time = ServerInstance->Time();
if (duration)
{
zlines.push_back(item);
- sort(zlines.begin(), zlines.end(),ZSortComparison);
+ sort(zlines.begin(), zlines.end(),XLineManager::ZSortComparison);
}
else
{
// adds a k:line
-bool add_kline(long duration, const char* source, const char* reason, const char* hostmask)
+bool XLineManager::add_kline(long duration, const char* source, const char* reason, const char* hostmask)
{
bool ret = del_kline(hostmask);
KLine item;
strlcpy(item.reason,reason,MAXBUF);
strlcpy(item.source,source,255);
item.n_matches = 0;
- item.set_time = TIME;
+ item.set_time = ServerInstance->Time();
if (duration)
{
klines.push_back(item);
- sort(klines.begin(), klines.end(),KSortComparison);
+ sort(klines.begin(), klines.end(),XLineManager::KSortComparison);
}
else
{
// deletes a g:line, returns true if the line existed and was removed
-bool del_gline(const char* hostmask)
+bool XLineManager::del_gline(const char* hostmask)
{
for (std::vector<GLine>::iterator i = glines.begin(); i != glines.end(); i++)
{
// deletes a e:line, returns true if the line existed and was removed
-bool del_eline(const char* hostmask)
+bool XLineManager::del_eline(const char* hostmask)
{
for (std::vector<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
{
// deletes a q:line, returns true if the line existed and was removed
-bool del_qline(const char* nickname)
+bool XLineManager::del_qline(const char* nickname)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
return false;
}
-bool qline_make_global(const char* nickname)
+bool XLineManager::qline_make_global(const char* nickname)
{
for (std::vector<QLine>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
return false;
}
-bool zline_make_global(const char* ipaddr)
+bool XLineManager::zline_make_global(const char* ipaddr)
{
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
// deletes a z:line, returns true if the line existed and was removed
-bool del_zline(const char* ipaddr)
+bool XLineManager::del_zline(const char* ipaddr)
{
for (std::vector<ZLine>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
// deletes a k:line, returns true if the line existed and was removed
-bool del_kline(const char* hostmask)
+bool XLineManager::del_kline(const char* hostmask)
{
for (std::vector<KLine>::iterator i = klines.begin(); i != klines.end(); i++)
{
// returns a pointer to the reason if a nickname matches a qline, NULL if it didnt match
-char* matches_qline(const char* nick)
+char* XLineManager::matches_qline(const char* nick)
{
if ((qlines.empty()) && (pqlines.empty()))
return NULL;
// returns a pointer to the reason if a host matches a gline, NULL if it didnt match
-char* matches_gline(const char* host)
+char* XLineManager::matches_gline(const char* host)
{
if ((glines.empty()) && (pglines.empty()))
return NULL;
return NULL;
}
-char* matches_exception(const char* host)
+char* XLineManager::matches_exception(const char* host)
{
if ((elines.empty()) && (pelines.empty()))
return NULL;
}
-void gline_set_creation_time(const char* host, time_t create_time)
+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++)
{
return ;
}
-void eline_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<ELine>::iterator i = elines.begin(); i != elines.end(); i++)
{
return;
}
-void qline_set_creation_time(const char* nick, time_t create_time)
+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++)
{
return;
}
-void zline_set_creation_time(const char* ip, time_t create_time)
+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++)
{
// returns a pointer to the reason if an ip address matches a zline, NULL if it didnt match
-char* matches_zline(const char* ipaddr)
+char* XLineManager::matches_zline(const char* ipaddr)
{
if ((zlines.empty()) && (pzlines.empty()))
return NULL;
// returns a pointer to the reason if a host matches a kline, NULL if it didnt match
-char* matches_kline(const char* host)
+char* XLineManager::matches_kline(const char* host)
{
if ((klines.empty()) && (pklines.empty()))
return NULL;
return NULL;
}
-bool 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);
}
-bool 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);
}
-bool 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);
}
-bool 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);
}
-bool 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);
}
// removes lines that have expired
-void expire_lines()
+void XLineManager::expire_lines()
{
- time_t current = TIME;
+ 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
* means that to expire the XLines we just need to do a while, picking off the top few until there are
while ((glines.size()) && (current > (glines.begin()->duration + glines.begin()->set_time)))
{
std::vector<GLine>::iterator i = glines.begin();
- ServerInstance->WriteOpers("*** 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 (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
glines.erase(i);
}
while ((elines.size()) && (current > (elines.begin()->duration + elines.begin()->set_time)))
{
std::vector<ELine>::iterator i = elines.begin();
- ServerInstance->WriteOpers("*** 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 (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
elines.erase(i);
}
while ((zlines.size()) && (current > (zlines.begin()->duration + zlines.begin()->set_time)))
{
std::vector<ZLine>::iterator i = zlines.begin();
- ServerInstance->WriteOpers("*** Expiring timed Z-Line %s (set by %s %d seconds ago)",i->ipaddr,i->source,i->duration);
+ 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)))
{
std::vector<KLine>::iterator i = klines.begin();
- ServerInstance->WriteOpers("*** 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 (set by %s %d seconds ago)",i->hostmask,i->source,i->duration);
klines.erase(i);
}
while ((qlines.size()) && (current > (qlines.begin()->duration + qlines.begin()->set_time)))
{
std::vector<QLine>::iterator i = qlines.begin();
- ServerInstance->WriteOpers("*** Expiring timed Q-Line %s (set by %s %d seconds ago)",i->nick,i->source,i->duration);
+ 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 apply_lines(const int What)
+void XLineManager::apply_lines(const int What)
{
char reason[MAXBUF];
char host[MAXBUF];
DELETE(Goners);
}
-void stats_k(userrec* user, string_list &results)
+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);
}
-void stats_g(userrec* user, string_list &results)
+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);
}
-void stats_q(userrec* user, string_list &results)
+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);
}
-void stats_z(userrec* user, string_list &results)
+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);
}
-void stats_e(userrec* user, string_list &results)
+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++)
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);
}
+
+XLineManager::XLineManager(InspIRCd* Instance) : ServerInstance(Instance)
+{
+}
projects / user / henk / code / inspircd.git / blobdiff