diff options
| author | Gleb Naumenko <naumenko.gs@gmail.com> | 2019-12-24 13:18:44 -0500 |
|---|---|---|
| committer | Gleb Naumenko <naumenko.gs@gmail.com> | 2019-12-25 08:59:08 -0500 |
| commit | ec45646de9e62b3d42c85716bfeb06d8f2b507dc (patch) | |
| tree | 2d3717818d8ea1b9a53f9b53af2390f7aee9ac21 /src/netaddress.cpp | |
| parent | 8feb4e4b667361bf23344149c01594abebd56fdb (diff) | |
| download | bitcoin-ec45646de9e62b3d42c85716bfeb06d8f2b507dc.tar.xz | |
Integrate ASN bucketing in Addrman and add tests
Instead of using /16 netgroups to bucket nodes in Addrman for connection
diversification, ASN, which better represents an actor in terms
of network-layer infrastructure, is used.
For testing, asmap.raw is used. It represents a minimal
asmap needed for testing purposes.
Diffstat (limited to 'src/netaddress.cpp')
| -rw-r--r-- | src/netaddress.cpp | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 4fbfa2b5c8..20b6a85905 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -6,6 +6,7 @@ #include <netaddress.h> #include <hash.h> #include <util/strencodings.h> +#include <util/asmap.h> #include <tinyformat.h> static const unsigned char pchIPv4[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff }; @@ -410,7 +411,7 @@ bool CNetAddr::GetIn6Addr(struct in6_addr* pipv6Addr) const * @note No two connections will be attempted to addresses with the same network * group. */ -std::vector<unsigned char> CNetAddr::GetGroup() const +std::vector<unsigned char> CNetAddr::GetGroup(const std::vector<bool> &asmap) const { std::vector<unsigned char> vchRet; int nClass = NET_IPV6; @@ -470,6 +471,27 @@ std::vector<unsigned char> CNetAddr::GetGroup() const else nBits = 32; + // If asmap is supplied and the address is IPv4/IPv6, + // ignore nBits and use 32/128 bits to obtain ASN from asmap. + // ASN is then returned to be used for bucketing. + if (asmap.size() != 0 && (nClass == NET_IPV4 || nClass == NET_IPV6)) { + nClass = NET_IPV6; + std::vector<bool> ip_bits(128); + for (int8_t byte_i = 0; byte_i < 16; ++byte_i) { + uint8_t cur_byte = GetByte(15 - byte_i); + for (uint8_t bit_i = 0; bit_i < 8; ++bit_i) { + ip_bits[byte_i * 8 + bit_i] = (cur_byte >> (7 - bit_i)) & 1; + } + } + + uint32_t asn = Interpret(asmap, ip_bits); + vchRet.push_back(nClass); + for (int i = 0; i < 4; i++) { + vchRet.push_back((asn >> (8 * i)) & 0xFF); + } + return vchRet; + } + vchRet.push_back(nClass); // push our ip onto vchRet byte by byte... |