# HG changeset patch
# User Pieter Wuille <pieter.wuille@gmail.com>
# Date 1336949001 -7200
# Node ID bb6f81dae658a02ccb07fdd7d9393e3ce2c48f55
# Parent  453d84fc6e116b6d2ff001c1387b9b3f6e8cc68d
Use getnameinfo() to get canonical IPv6 addresses

diff --git a/src/netbase.cpp b/src/netbase.cpp
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -711,7 +711,19 @@
 
 std::string CNetAddr::ToStringIP() const
 {
-    if (IsIPv4())
+    CService serv(*this, 0);
+#ifdef USE_IPV6
+    struct sockaddr_storage sockaddr;
+#else
+    struct sockaddr sockaddr;
+#endif
+    socklen_t socklen = sizeof(sockaddr);
+    if (serv.GetSockAddr((struct sockaddr*)&sockaddr, &socklen)) {
+        char name[1025] = "";
+        if (!getnameinfo((const struct sockaddr*)&sockaddr, socklen, name, sizeof(name), NULL, 0, NI_NUMERICHOST))
+            return std::string(name);
+    }
+    if (IsIPv4()) 
         return strprintf("%u.%u.%u.%u", GetByte(3), GetByte(2), GetByte(1), GetByte(0));
     else
         return strprintf("%x:%x:%x:%x:%x:%x:%x:%x",