net: Avoid calling getnameinfo when formatting IPv4 addresses in CNetAddr::ToStringIP

practicalswift · practicalswift · commit 58580a827d10 · 2021-04-01T08:06:01.000Z
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -576,6 +576,7 @@ std::string CNetAddr::ToStringIP() const
 {
     switch (m_net) {
     case NET_IPV4:
+        return IPv4ToString(m_addr);
     case NET_IPV6: {
         CService serv(*this, 0);
         struct sockaddr_storage sockaddr;
@@ -586,9 +587,6 @@ std::string CNetAddr::ToStringIP() const
                              sizeof(name), nullptr, 0, NI_NUMERICHOST))
                 return std::string(name);
         }
-        if (m_net == NET_IPV4) {
-            return IPv4ToString(m_addr);
-        }
         return IPv6ToString(m_addr);
     }
     case NET_ONION:

Original file line number	Diff line number	Diff line change
`@@ -576,6 +576,7 @@ std::string CNetAddr::ToStringIP() const`
`576`	`576`	`{`
`577`	`577`	`switch (m_net) {`
`578`	`578`	`case NET_IPV4:`
	`579`	`+ return IPv4ToString(m_addr);`
`579`	`580`	`case NET_IPV6: {`
`580`	`581`	`CService serv(*this, 0);`
`581`	`582`	`struct sockaddr_storage sockaddr;`
`@@ -586,9 +587,6 @@ std::string CNetAddr::ToStringIP() const`
`586`	`587`	`sizeof(name), nullptr, 0, NI_NUMERICHOST))`
`587`	`588`	`return std::string(name);`
`588`	`589`	`}`
`589`		`- if (m_net == NET_IPV4) {`
`590`		`- return IPv4ToString(m_addr);`
`591`		`- }`
`592`	`590`	`return IPv6ToString(m_addr);`
`593`	`591`	`}`
`594`	`592`	`case NET_ONION:`