diff options
| author | Alexander Maassen <outsider@twingoversum.scarynet.org> | 2017-05-26 18:17:13 +0200 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2017-05-27 09:56:18 -0400 |
| commit | bfcfd0b727bb7216ad1572797a2b049a72389258 (patch) | |
| tree | 885157145f633c6eba9c6efbb4920f4d3c98841c /modules/m_dnsbl.cpp | |
| parent | 087f1cb3596aeb05d08a6d9ea3b5afa2162b0029 (diff) | |
Moved m_dns's reverse ip method to sockaddrs::reverse().
Updated m_dnsbl to support ipv6.
Diffstat (limited to 'modules/m_dnsbl.cpp')
| -rw-r--r-- | modules/m_dnsbl.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/modules/m_dnsbl.cpp b/modules/m_dnsbl.cpp index 900756694..9a017ea39 100644 --- a/modules/m_dnsbl.cpp +++ b/modules/m_dnsbl.cpp @@ -160,9 +160,8 @@ class ModuleDNSBL : public Module if (!this->check_on_netburst && !user->server->IsSynced()) return; - /* At this time we only support IPv4 */ - if (!user->ip.valid() || user->ip.sa.sa_family != AF_INET) - /* User doesn't have a valid IPv4 IP (ipv6/spoof/etc) */ + if (!user->ip.valid()) + /* User doesn't have a valid IP (spoof/etc) */ return; if (this->blacklists.empty()) @@ -174,17 +173,13 @@ class ModuleDNSBL : public Module return; } - const unsigned long &ip = user->ip.sa4.sin_addr.s_addr; - unsigned long reverse_ip = (ip << 24) | ((ip & 0xFF00) << 8) | ((ip & 0xFF0000) >> 8) | (ip >> 24); - - sockaddrs reverse = user->ip; - reverse.sa4.sin_addr.s_addr = reverse_ip; + Anope::string reverse = user->ip.reverse(); for (unsigned i = 0; i < this->blacklists.size(); ++i) { const Blacklist &b = this->blacklists[i]; - Anope::string dnsbl_host = reverse.addr() + "." + b.name; + Anope::string dnsbl_host = reverse + "." + b.name; DNSBLResolver *res = NULL; try { |