ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-24 07:06:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

because Windows....

Browse Source
This commit is contained in:
Grant Limberg 2018-10-23 13:21:25 -07:00
parent 7dbccf08ae
commit 7c72653385
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/InetAddress.cpp
View File

@ -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;

2
service/OneService.cpp
View File

@ -67,7 +67,7 @@
#include <ShlObj.h>
#include <netioapi.h>
#include <iphlpapi.h>
#include <unistd.h>
//#include <unistd.h>
#define stat _stat
#else
#include <sys/types.h>