net: Add IPv4ToString (we already have IPv6ToString)

practicalswift · practicalswift · commit 585805738438 · 2021-04-01T08:00:48.000Z
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -551,6 +551,11 @@ enum Network CNetAddr::GetNetwork() const
     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)
 {
     assert(a.size() == ADDR_IPV6_SIZE);
@@ -582,7 +587,7 @@ std::string CNetAddr::ToStringIP() const
                 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 IPv4ToString(m_addr);
         }
         return IPv6ToString(m_addr);
     }

Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,11 @@ enum Network CNetAddr::GetNetwork() const`
`551`	`551`	`return m_net;`
`552`	`552`	`}`
`553`	`553`
	`554`	`+static std::string IPv4ToString(Span<const uint8_t> a)`
	`555`	`+{`
	`556`	`+ return strprintf("%u.%u.%u.%u", a[0], a[1], a[2], a[3]);`
	`557`	`+}`
	`558`	`+`
`554`	`559`	`static std::string IPv6ToString(Span<const uint8_t> a)`
`555`	`560`	`{`
`556`	`561`	`assert(a.size() == ADDR_IPV6_SIZE);`
`@@ -582,7 +587,7 @@ std::string CNetAddr::ToStringIP() const`
`582`	`587`	`return std::string(name);`
`583`	`588`	`}`
`584`	`589`	`if (m_net == NET_IPV4) {`
`585`		`- return strprintf("%u.%u.%u.%u", m_addr[0], m_addr[1], m_addr[2], m_addr[3]);`
	`590`	`+ return IPv4ToString(m_addr);`
`586`	`591`	`}`
`587`	`592`	`return IPv6ToString(m_addr);`
`588`	`593`	`}`