diff options
| author | Adam <Adam@anope.org> | 2015-04-06 10:20:20 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2015-04-07 11:41:04 -0400 |
| commit | d5c3c15fad07d34cd7d8089731f01c3cb14c319f (patch) | |
| tree | 598f36eff1af5b9f7c834dec6347313730954f73 /src/modules | |
| parent | e3303330f8cc04121907715d789370f492878646 (diff) | |
Add ipv6 dnsbl support
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_dnsbl.cpp | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 7b38da4bf..5eaa8c279 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -324,7 +324,7 @@ class ModuleDNSBL : public Module void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE { - if ((user->exempt) || (user->client_sa.sa.sa_family != AF_INET) || !DNS) + if ((user->exempt) || !DNS) return; if (user->MyClass) @@ -335,13 +335,32 @@ class ModuleDNSBL : public Module else ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP"); - unsigned int a, b, c, d; - d = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF; - c = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF; - b = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF; - a = (unsigned int) user->client_sa.in4.sin_addr.s_addr & 0xFF; + std::string reversedip; + if (user->client_sa.sa.sa_family == AF_INET) + { + unsigned int a, b, c, d; + d = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF; + c = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF; + b = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF; + a = (unsigned int) user->client_sa.in4.sin_addr.s_addr & 0xFF; + + reversedip = ConvToStr(d) + "." + ConvToStr(c) + "." + ConvToStr(b) + "." + ConvToStr(a); + } + else if (user->client_sa.sa.sa_family == AF_INET6) + { + const unsigned char* ip = user->client_sa.in6.sin6_addr.s6_addr; + + std::string buf = BinToHex(ip, 16); + for (std::string::const_reverse_iterator it = buf.rbegin(); it != buf.rend(); ++it) + { + reversedip.push_back(*it); + reversedip.push_back('.'); + } + } + else + return; - const std::string reversedip = ConvToStr(d) + "." + ConvToStr(c) + "." + ConvToStr(b) + "." + ConvToStr(a); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Reversed IP %s -> %s", user->GetIPString().c_str(), reversedip.c_str()); countExt.set(user, DNSBLConfEntries.size()); |