virtual Version GetVersion()
{
- return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_VENDOR, API_VERSION);
}
}
else
{
- memset(e->records, 0, 256);
+ memset(e->records, 0, sizeof(e->records));
e->type = DNSBLConfEntry::A_RECORD;
irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false);
long item = -1;
/* Use portparser for record replies */
/* yeah, logic here is a little messy */
- if (e->bitmask <= 0)
+ if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type))
{
ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i);
}
unsigned char a, b, c, d;
char reversedipbuf[128];
std::string reversedip;
- bool success = false;
+ bool success;
- if (!inet_aton(user->GetIPString(), &in))
- {
-#ifdef IPV6
- /* We could have an ipv6 address here */
- std::string x = user->GetIPString();
- /* Is it a 4in6 address? (Compensate for this kernel kludge that people love) */
- if (x.find("0::ffff:") == 0)
- {
- x.erase(x.begin(), x.begin() + 8);
- if (inet_aton(x.c_str(), &in))
- success = true;
- }
-#endif
- }
- else
- {
- success = true;
- }
+ success = inet_aton(user->GetIPString(), &in);
if (!success)
return 0;