diff options
| author | Jon Atack <jon@atack.com> | 2020-09-13 11:09:53 +0200 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2020-10-02 16:42:02 +0200 |
| commit | f36887fa47b42af60f8a06a3995baca7c73ca310 (patch) | |
| tree | 139254b4d4ae8a12232d6e1af731b7a91d565534 /src | |
| parent | 5cb5fd3005435f3a7ca0c3401951d1db8db4fb88 (diff) | |
net: rename CNetAddr scopeId to m_scope_id, improve code doc
Diffstat (limited to 'src')
| -rw-r--r-- | src/netaddress.cpp | 4 | ||||
| -rw-r--r-- | src/netaddress.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/netaddress.cpp b/src/netaddress.cpp index 08714dc2ec..0c4c0a339b 100644 --- a/src/netaddress.cpp +++ b/src/netaddress.cpp @@ -281,7 +281,7 @@ CNetAddr::CNetAddr(const struct in_addr& ipv4Addr) CNetAddr::CNetAddr(const struct in6_addr& ipv6Addr, const uint32_t scope) { SetLegacyIPv6(Span<const uint8_t>(reinterpret_cast<const uint8_t*>(&ipv6Addr), sizeof(ipv6Addr))); - scopeId = scope; + m_scope_id = scope; } bool CNetAddr::IsBindAny() const @@ -918,7 +918,7 @@ bool CService::GetSockAddr(struct sockaddr* paddr, socklen_t *addrlen) const memset(paddrin6, 0, *addrlen); if (!GetIn6Addr(&paddrin6->sin6_addr)) return false; - paddrin6->sin6_scope_id = scopeId; + paddrin6->sin6_scope_id = m_scope_id; paddrin6->sin6_family = AF_INET6; paddrin6->sin6_port = htons(port); return true; diff --git a/src/netaddress.h b/src/netaddress.h index 59f1b87ad3..78e7e1b4b3 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -130,7 +130,11 @@ class CNetAddr */ Network m_net{NET_IPV6}; - uint32_t scopeId{0}; // for scoped/link-local ipv6 addresses + /** + * Scope id if scoped/link-local IPV6 address. + * See https://tools.ietf.org/html/rfc4007 + */ + uint32_t m_scope_id{0}; public: CNetAddr(); @@ -388,7 +392,7 @@ class CNetAddr "Address too long: %u > %u", address_size, MAX_ADDRV2_SIZE)); } - scopeId = 0; + m_scope_id = 0; if (SetNetFromBIP155Network(bip155_net, address_size)) { m_addr.resize(address_size); |