*/
#include "inspircd.h"
-#include "users.h"
-#include "modules.h"
#include "wildcard.h"
#include "xline.h"
-#include "cull_list.h"
/* Version two, now with optimized expiry!
*
* 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
+ * (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
* soonest is always pointed at by vector::begin(), so a simple while loop can
* very efficiently, very quickly and above all SAFELY pick off the first few
{
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;
}
{
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;
}
{
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;
}
{
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;
}
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 = "*";
+ n.first.assign("*");
if (!n.second.length())
- n.second = "*";
+ n.second.assign("*");
}
else
{
{
IdentHostPair ih = IdentSplit(hostmask);
- bool ret = del_gline(hostmask);
-
+ if (del_gline(hostmask, true))
+ return false;
+
GLine* item = new GLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
-
+
if (duration)
{
glines.push_back(item);
{
pglines.push_back(item);
}
-
- return !ret;
+
+ return true;
}
// adds an e:line (exception to bans)
{
IdentHostPair ih = IdentSplit(hostmask);
- bool ret = del_eline(hostmask);
+ if (del_eline(hostmask, true))
+ return false;
ELine* item = new ELine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
{
pelines.push_back(item);
}
- return !ret;
+ return true;
}
// adds a q:line
bool XLineManager::add_qline(long duration, const char* source, const char* reason, const char* nickname)
{
- bool ret = del_qline(nickname);
+ if (del_qline(nickname, true))
+ return false;
+
QLine* item = new QLine(ServerInstance->Time(), duration, source, reason, nickname);
if (duration)
{
pqlines.push_back(item);
}
- return !ret;
+ return true;
}
// adds a z:line
bool XLineManager::add_zline(long duration, const char* source, const char* reason, const char* ipaddr)
{
- bool ret = del_zline(ipaddr);
-
if (strchr(ipaddr,'@'))
{
while (*ipaddr != '@')
ipaddr++;
}
+ if (del_zline(ipaddr, true))
+ return false;
+
ZLine* item = new ZLine(ServerInstance->Time(), duration, source, reason, ipaddr);
if (duration)
{
pzlines.push_back(item);
}
- return !ret;
+ return true;
}
// adds a k:line
{
IdentHostPair ih = IdentSplit(hostmask);
- bool ret = del_kline(hostmask);
+ if (del_kline(hostmask, true))
+ return false;
KLine* item = new KLine(ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());
{
pklines.push_back(item);
}
- return !ret;
+ return true;
}
// deletes a g:line, returns true if the line existed and was removed
-bool XLineManager::del_gline(const char* hostmask)
+bool XLineManager::del_gline(const char* hostmask, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<GLine*>::iterator i = glines.begin(); i != glines.end(); i++)
{
if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
- delete *i;
- glines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ glines.erase(i);
+ }
return true;
}
}
{
if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
- delete *i;
- pglines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ pglines.erase(i);
+ }
return true;
}
}
// deletes a e:line, returns true if the line existed and was removed
-bool XLineManager::del_eline(const char* hostmask)
+bool XLineManager::del_eline(const char* hostmask, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<ELine*>::iterator i = elines.begin(); i != elines.end(); i++)
{
if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
- delete *i;
- elines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ elines.erase(i);
+ }
return true;
}
}
{
if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
- delete *i;
- pelines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ pelines.erase(i);
+ }
return true;
}
}
// deletes a q:line, returns true if the line existed and was removed
-bool XLineManager::del_qline(const char* nickname)
+bool XLineManager::del_qline(const char* nickname, bool simulate)
{
for (std::vector<QLine*>::iterator i = qlines.begin(); i != qlines.end(); i++)
{
if (!strcasecmp(nickname,(*i)->nick))
{
- delete *i;
- qlines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ qlines.erase(i);
+ }
return true;
}
}
{
if (!strcasecmp(nickname,(*i)->nick))
{
- delete *i;
- pqlines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ pqlines.erase(i);
+ }
return true;
}
}
// deletes a z:line, returns true if the line existed and was removed
-bool XLineManager::del_zline(const char* ipaddr)
+bool XLineManager::del_zline(const char* ipaddr, bool simulate)
{
for (std::vector<ZLine*>::iterator i = zlines.begin(); i != zlines.end(); i++)
{
if (!strcasecmp(ipaddr,(*i)->ipaddr))
{
- delete *i;
- zlines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ zlines.erase(i);
+ }
return true;
}
}
{
if (!strcasecmp(ipaddr,(*i)->ipaddr))
{
- delete *i;
- pzlines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ pzlines.erase(i);
+ }
return true;
}
}
// deletes a k:line, returns true if the line existed and was removed
-bool XLineManager::del_kline(const char* hostmask)
+bool XLineManager::del_kline(const char* hostmask, bool simulate)
{
IdentHostPair ih = IdentSplit(hostmask);
for (std::vector<KLine*>::iterator i = klines.begin(); i != klines.end(); i++)
{
if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
- delete *i;
- klines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ klines.erase(i);
+ }
return true;
}
}
{
if (!strcasecmp(ih.first.c_str(),(*i)->identmask) && !strcasecmp(ih.second.c_str(),(*i)->hostmask))
{
- delete *i;
- pklines.erase(i);
+ if (!simulate)
+ {
+ delete *i;
+ pklines.erase(i);
+ }
return true;
}
}
}
ELine* XLineManager::matches_exception(userrec* user, bool permonly)
-{
+{
if ((elines.empty()) && (pelines.empty()))
return NULL;
char host2[MAXBUF];
return;
}
}
- return ;
+ return ;
}
void XLineManager::eline_set_creation_time(const char* host, time_t create_time)
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))
{
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
if ((!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
return;
- CullList* Goners = new CullList(ServerInstance);
XLine* check = NULL;
for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
if ((check = matches_gline(u,true)))
{
snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "G-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
if ((check = matches_kline(u,true)))
{
snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "K-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
if ((check = matches_qline(u->nick,true)))
{
snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "Q-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
if ((check = matches_zline(u->GetIPString(),true)))
{
snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "Z-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
}
-
- Goners->Apply();
- DELETE(Goners);
}
else
{
if ((!glines.size()) && (!klines.size()) && (!zlines.size()) && (!qlines.size()) &&
(!pglines.size()) && (!pklines.size()) && (!pzlines.size()) && (!pqlines.size()))
return;
-
- CullList* Goners = new CullList(ServerInstance);
+
XLine* check = NULL;
for (std::vector<userrec*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
{
if ((check = matches_gline(u)))
{
snprintf(reason,MAXBUF,"G-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "G-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
if ((What & APPLY_KLINES) && (klines.size() || pklines.size()))
if ((check = matches_kline(u)))
{
snprintf(reason,MAXBUF,"K-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "K-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
if ((What & APPLY_QLINES) && (qlines.size() || pqlines.size()))
if ((check = matches_qline(u->nick)))
{
snprintf(reason,MAXBUF,"Q-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "Q-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
if ((What & APPLY_ZLINES) && (zlines.size() || pzlines.size()))
{
if ((check = matches_zline(u->GetIPString())))
{
- snprintf(reason,MAXBUF,"Z-Lined: %s",check->reason);
- Goners->AddItem(u,reason);
+ snprintf(reason,MAXBUF,"Z-Lined: %s", check->reason);
+ if (*ServerInstance->Config->MoronBanner)
+ u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+ if (ServerInstance->Config->HideBans)
+ userrec::QuitUser(ServerInstance, u, "Z-Lined", reason);
+ else
+ userrec::QuitUser(ServerInstance, u, reason);
}
}
}
-
- Goners->Apply();
- DELETE(Goners);
}
}