pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-28 10:26:37 +02:00
Code Activity

Merge pull request #188 from key2peace/2.0

Browse Source 
IPv6 support for m_dnsbl and sockaddrs::reverse()
This commit is contained in:
Adam
2017-05-27 09:58:34 -04:00
committed by GitHub
parent 087f1cb359 bfcfd0b727
commit 0ace685597
4 changed files with 53 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sockets.h
+5
View File
@@ -57,6 +57,11 @@ union CoreExport sockaddrs
*/
Anope::string addr() const;
/** Get the reverse address represented by this addr
* @return The reverse address
*/
Anope::string reverse() const;
/* Is this address ipv6? */
bool ipv6() const;
modules/m_dns.cpp
+9 -25
View File
@@ -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");
}
}
modules/m_dnsbl.cpp
+4 -9
View File
@@ -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
{
src/sockets.cpp
+35
View File
@@ -95,6 +95,41 @@ Anope::string sockaddrs::addr() const
return "";
}
Anope::string sockaddrs::reverse() const
{
char address[128];
switch (sa.sa_family)
{
case AF_INET6:
{
static const char hex[] = "0123456789abcdef";
unsigned reverse_ip_count = 0;
for (int j = 15; j >= 0; --j)
{
address[reverse_ip_count++] = hex[sa6.sin6_addr.s6_addr[j] & 0xF];
address[reverse_ip_count++] = '.';
address[reverse_ip_count++] = hex[sa6.sin6_addr.s6_addr[j] >> 4];
address[reverse_ip_count++] = '.';
}
/* Remove the last '.' */
address[reverse_ip_count - 1] = 0;
return address;
}
case AF_INET:
{
unsigned long forward = sa4.sin_addr.s_addr;
in_addr rev;
rev.s_addr = forward << 24 | (forward & 0xFF00) << 8 | (forward & 0xFF0000) >> 8 | forward >> 24;
if (inet_ntop(AF_INET, &rev, address, sizeof(address)))
return address;
break;
}
}
return "";
}
bool sockaddrs::ipv6() const
{
return sa.sa_family == AF_INET6;