@@ -34,7+35,7 @@ class DNSBLConfEntry : public refcountbase
std::string name, ident, host, domain, reason;
EnumBanaction banaction;
EnumType type;
std::string name, ident, host, domain, reason;
EnumBanaction banaction;
EnumType type;
- long duration;
+ unsigned long duration;
unsigned int bitmask;
unsigned char records[256];
unsigned long stats_hits, stats_misses;
unsigned int bitmask;
unsigned char records[256];
unsigned long stats_hits, stats_misses;
@@ -42,7+43,7 @@ class DNSBLConfEntry : public refcountbase
};
};
-/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+/** Resolver for CGI:IRC hostnames encoded in ident/real name
*/
class DNSBLResolver : public DNS::Request
{
*/
class DNSBLResolver : public DNS::Request
{
@@ -73,7+74,7 @@ class DNSBLResolver : public DNS::Request
// All replies should be in 127.0.0.0/8
if (ans_record->rdata.compare(0, 4, "127.") != 0)
{
// All replies should be in 127.0.0.0/8
if (ans_record->rdata.compare(0, 4, "127.") != 0)
{
- ServerInstance->SNO->WriteGlobalSno('a', "DNSBL: %s returned address outside of acceptable subnet 127.0.0.0/8: %s", ConfEntry->domain.c_str(), ans_record->rdata.c_str());
+ ServerInstance->SNO->WriteGlobalSno('d', "DNSBL: %s returned address outside of acceptable subnet 127.0.0.0/8: %s", ConfEntry->domain.c_str(), ans_record->rdata.c_str());
ConfEntry->stats_misses++;
return;
}
ConfEntry->stats_misses++;
return;
}
@@ -199,7+200,7 @@ class DNSBLResolver : public DNS::Request
break;
}
break;
}
- ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s%s detected as being on a DNS blacklist (%s) with result %d", them->nick.empty() ? "<unknown>" : "", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
+ ServerInstance->SNO->WriteGlobalSno('d', "Connecting user %s%s detected as being on a DNS blacklist (%s) with result %d", them->nick.empty() ? "<unknown>" : "", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record);
}
else
ConfEntry->stats_misses++;
}
else
ConfEntry->stats_misses++;
@@ -220,7+221,7 @@ class DNSBLResolver : public DNS::Request
}
};
}
};
-class ModuleDNSBL : public Module
+class ModuleDNSBL : public Module, public Stats::EventListener