diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-14 04:14:28 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-05-14 04:14:28 -0700 |
| commit | 0071a540d40f8e7cf75eb555f007ab61473a3a81 (patch) | |
| tree | e3b6f8dd8ca9573336c28be75ad368f287bd12a8 | |
| parent | 09b4e26a446c302f0cce176bf572da956bb2515e (diff) | |
| parent | ca81464697ca49452ab3e399c70d450f8d3b4028 (diff) | |
| download | bitcoin-0071a540d40f8e7cf75eb555f007ab61473a3a81.tar.xz | |
Merge pull request #1291 from sipa/canonames
Use getnameinfo() to get canonical IPv6 addresses
| -rw-r--r-- | src/netbase.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 2131bdf75b..3fe42a7a74 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -711,7 +711,19 @@ enum Network CNetAddr::GetNetwork() const 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", |