diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2018-10-24 12:08:48 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2018-10-24 12:08:48 -0700 |
| commit | f901b9dd6bd877c19fca6b95128c583be6e25d80 (patch) | |
| tree | 512e8777426ddf6f717d6b216537ab07d063810a /node/InetAddress.cpp | |
| parent | d87fcca17663bc256f64fb19d74540115f9d0565 (diff) | |
| parent | 7c726533850eb0a6f3a40d72f42bd50a8e93e621 (diff) | |
| download | infinitytier-f901b9dd6bd877c19fca6b95128c583be6e25d80.tar.gz infinitytier-f901b9dd6bd877c19fca6b95128c583be6e25d80.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/zerotier/ZeroTierOne into dev
Diffstat (limited to 'node/InetAddress.cpp')
| -rw-r--r-- | node/InetAddress.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/node/InetAddress.cpp b/node/InetAddress.cpp index 3eb5579f..54daa668 100644 --- a/node/InetAddress.cpp +++ b/node/InetAddress.cpp @@ -142,11 +142,19 @@ char *InetAddress::toIpString(char buf[64]) const buf[0] = (char)0; switch(ss_family) { case AF_INET: { +#ifdef _WIN32 + inet_ntop(AF_INET, (void*)&reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN); +#else inet_ntop(AF_INET, &reinterpret_cast<const struct sockaddr_in *>(this)->sin_addr.s_addr, buf, INET_ADDRSTRLEN); +#endif } break; case AF_INET6: { +#ifdef _WIN32 + inet_ntop(AF_INET6, (void*)reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN); +#else inet_ntop(AF_INET6, reinterpret_cast<const struct sockaddr_in6 *>(this)->sin6_addr.s6_addr, buf, INET6_ADDRSTRLEN); +#endif } break; } return buf; |