diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/m_dns.cpp | 34 | ||||
| -rw-r--r-- | modules/m_dnsbl.cpp | 13 |
2 files changed, 13 insertions, 34 deletions
diff --git a/modules/m_dns.cpp b/modules/m_dns.cpp index 34b7d5d2f..2e0aa3f8f 100644 --- a/modules/m_dns.cpp +++ b/modules/m_dns.cpp @@ -296,32 +296,16 @@ class Packet : public Query if (!ip.valid()) throw SocketException("Invalid IP"); - if (q.name.find(':') != Anope::string::npos) + switch (ip.family()) { - const char *const hex = "0123456789abcdef"; - char reverse_ip[128]; - unsigned reverse_ip_count = 0; - for (int j = 15; j >= 0; --j) - { - reverse_ip[reverse_ip_count++] = hex[ip.sa6.sin6_addr.s6_addr[j] & 0xF]; - reverse_ip[reverse_ip_count++] = '.'; - reverse_ip[reverse_ip_count++] = hex[ip.sa6.sin6_addr.s6_addr[j] >> 4]; - reverse_ip[reverse_ip_count++] = '.'; - } - reverse_ip[reverse_ip_count++] = 0; - - q.name = reverse_ip; - q.name += "ip6.arpa"; - } - else - { - unsigned long forward = ip.sa4.sin_addr.s_addr; - in_addr reverse; - reverse.s_addr = forward << 24 | (forward & 0xFF00) << 8 | (forward & 0xFF0000) >> 8 | forward >> 24; - - ip.ntop(AF_INET, &reverse); - - q.name = ip.addr() + ".in-addr.arpa"; + case AF_INET6: + q.name = ip.reverse() + ".ip6.arpa"; + break; + case AF_INET: + q.name = ip.reverse() + ".in-addr.arpa"; + break; + default: + throw SocketException("Unsupported IP Family"); } } 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 { |