ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 11:09:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

This one too, grr

Browse Source 
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8434 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2007-10-31 18:06:54 +00:00
parent de08da58f7
commit ca7cb01b7a
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/m_dnsbl.cpp
View File

@ -118,7 +118,7 @@ class DNSBLResolver : public Resolver
if (ServerInstance->XLines->AddLine(kl))
{
ServerInstance->XLines->ApplyLines();
FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, them->MakeHostIP()));
}
else
delete kl;
@ -131,7 +131,7 @@ class DNSBLResolver : public Resolver
if (ServerInstance->XLines->AddLine(gl))
{
ServerInstance->XLines->ApplyLines();
FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, them->MakeHostIP()));
}
else
delete gl;

13
src/modules/m_filter.h
View File

@ -280,11 +280,14 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri
}
if (f->action == "gline")
{
if (ServerInstance->XLines->AddGLine(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), user->MakeHostIP()))
GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString());
if (ServerInstance->XLines->AddLine(gl))
{
ServerInstance->XLines->ApplyLines();
FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP()));
}
else
delete gl;
}
ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action);
@ -365,14 +368,14 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters
if (f->action == "gline")
{
/* Note: We gline *@IP so that if their host doesnt resolve the gline still applies. */
std::string wild = "*@";
wild.append(user->GetIPString());
if (ServerInstance->XLines->AddGLine(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), wild.c_str()))
GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString());
if (ServerInstance->XLines->AddLine(gl))
{
ServerInstance->XLines->ApplyLines();
FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP()));
}
else
delete gl;
}
return 1;
}