mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-15 04:11:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#21564: net: Avoid calling getnameinfo when formatting IPv4 addresses in CNetAddr::ToStringIP

Browse source 
58580a827d net: Avoid calling getnameinfo when formatting IPv4 addresses in CNetAddr::ToStringIP (practicalswift)
5858057384 net: Add IPv4ToString (we already have IPv6ToString) (practicalswift)

Pull request description:

  Avoid calling `getnameinfo` when formatting IPv4 addresses in `CNetAddr::ToStringIP`.

ACKs for top commit:
  naumenkogs:
    ACK 58580a827d
  0xB10C:
    ACK 58580a827d
  vasild:
    ACK 58580a827d

Tree-SHA512: 25e3c416acb74908d001baf1cf64c04cbc0d94ce8e7ce5a601f1343062d5d748cb406a3404e6f2b6e7e979c6300b38439e1bfd70ea90ec8c0ec2d7568f09fbcd
This commit is contained in:
MarcoFalke 2021-04-22 12:29:20 +02:00
commit aaf66413e1
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/netaddress.cpp
View file

@ -551,6 +551,11 @@ enum Network CNetAddr::GetNetwork() const
return m_net; return m_net;
} }
static std::string IPv4ToString(Span<const uint8_t> a)
{
return strprintf("%u.%u.%u.%u", a[0], a[1], a[2], a[3]);
}
static std::string IPv6ToString(Span<const uint8_t> a) static std::string IPv6ToString(Span<const uint8_t> a)
{ {
assert(a.size() == ADDR_IPV6_SIZE); assert(a.size() == ADDR_IPV6_SIZE);
@ -571,6 +576,7 @@ std::string CNetAddr::ToStringIP() const
{ {
switch (m_net) { switch (m_net) {
case NET_IPV4: case NET_IPV4:
return IPv4ToString(m_addr);
case NET_IPV6: { case NET_IPV6: {
CService serv(*this, 0); CService serv(*this, 0);
struct sockaddr_storage sockaddr; struct sockaddr_storage sockaddr;
@ -581,9 +587,6 @@ std::string CNetAddr::ToStringIP() const
sizeof(name), nullptr, 0, NI_NUMERICHOST)) sizeof(name), nullptr, 0, NI_NUMERICHOST))
return std::string(name); return std::string(name);
} }
if (m_net == NET_IPV4) {
return strprintf("%u.%u.%u.%u", m_addr[0], m_addr[1], m_addr[2], m_addr[3]);
}
return IPv6ToString(m_addr); return IPv6ToString(m_addr);
} }
case NET_ONION: case NET_ONION: