long duration;
int bitmask;
DNSBLConfEntry(): duration(86400),bitmask(0) {}
+ ~DNSBLConfEntry() { }
};
if(result.length())
{
unsigned int bitmask=0;
- unsigned int octetpos=0;
- std::string tmp = result;
+ in_addr resultip;
- while(tmp.length()>0)
- {
- std::string octet;
- /* Fix by brain, npos is -1, so unsigned int will never match */
- std::string::size_type lastdot = tmp.rfind(".");
-
- if (lastdot == std::string::npos)
- {
- octet=tmp;
- tmp.clear();
- }
- else
- {
- octet=tmp.substr(lastdot+1,tmp.length()-lastdot+1);
- tmp.resize(lastdot);
- }
-
- bitmask += (256 ^ octetpos) * atoi(octet.c_str());
- octetpos += 1;
- }
+ /* Convert the result to an in_addr (we can gaurantee we got ipv4)
+ * Whoever did the loop that was here before, I AM CONFISCATING
+ * YOUR CRACKPIPE. you know who you are. -- Brain
+ */
+ inet_aton(result.c_str(), &resultip);
+ bitmask = resultip.s_addr >> 24; /* Last octet (network byte order */
bitmask &= ConfEntry->bitmask;
case DNSBLConfEntry::I_KLINE:
{
ServerInstance->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString());
- FOREACH_MOD(I_OnAddKLine,OnAddKLine(ServerInstance->Duration(ConfEntry->duration), NULL, reason, std::string("*@") + them->GetIPString()));
+ FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString()));
break;
}
case DNSBLConfEntry::I_GLINE:
{
ServerInstance->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString());
- FOREACH_MOD(I_OnAddGLine,OnAddGLine(ServerInstance->Duration(ConfEntry->duration), NULL, reason, std::string("*@") + them->GetIPString()));
+ FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString()));
break;
}
case DNSBLConfEntry::I_ZLINE:
{
ServerInstance->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, them->GetIPString());
- FOREACH_MOD(I_OnAddZLine,OnAddZLine(ServerInstance->Duration(ConfEntry->duration), NULL, reason, them->GetIPString()));
+ FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
break;
}
case DNSBLConfEntry::I_UNKNOWN:
void ClearEntries()
{
std::vector<DNSBLConfEntry *>::iterator i;
- while ((i = DNSBLConfEntries.begin()) != DNSBLConfEntries.end())
- {
- DNSBLConfEntries.erase(i);
+ for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
delete *i;
- }
+ DNSBLConfEntries.clear();
}
/** Fill our conf vector with data