- changes for MUSL builds
This commit is contained in:
@@ -434,40 +434,40 @@ bool NetworkHelper::hasIPv6() const
|
||||
if (item.family() == AF_INET6 && (item.isLAN() || item.isPublic()))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
void NetworkHelper::NetworkToHost(const in6_addr& addr6, uint32_t* output)
|
||||
{
|
||||
for (int i=0; i<4; i++)
|
||||
#if defined(TARGET_WIN)
|
||||
output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]);
|
||||
#elif defined(TARGET_IOS) || defined(TARGET_OSX)
|
||||
output[i] = ntohl(addr6.__u6_addr.__u6_addr32[i]);
|
||||
#elif defined(TARGET_OPENWRT)
|
||||
output[i] = ntohl(addr6.__in6_union.__s6_addr32[i]);
|
||||
#elif defined(TARGET_LINUX)
|
||||
output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]);
|
||||
#elif defined(TARGET_ANDROID)
|
||||
output[i] = ntohl(addr6.in6_u.u6_addr32[i]);
|
||||
#endif
|
||||
}
|
||||
|
||||
void NetworkHelper::HostToNetwork(const uint32_t* input, in6_addr& output)
|
||||
{
|
||||
for (int i=0; i<4; i++)
|
||||
#if defined(TARGET_WIN)
|
||||
((uint32_t*)&output.u.Byte[0])[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_OSX) || defined(TARGET_IOS)
|
||||
output.__u6_addr.__u6_addr32[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_OPENWRT)
|
||||
output.__in6_union.__s6_addr32[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_LINUX)
|
||||
output.__in6_u.__u6_addr32[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_ANDROID)
|
||||
output.in6_u.u6_addr32[i] = htonl(input[i]);
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void NetworkHelper::NetworkToHost(const in6_addr& addr6, uint32_t* output)
|
||||
{
|
||||
for (int i=0; i<4; i++)
|
||||
#if defined(TARGET_WIN)
|
||||
output[i] = ntohl(((uint32_t*)addr6.u.Byte[0])[i]);
|
||||
#elif defined(TARGET_IOS) || defined(TARGET_OSX)
|
||||
output[i] = ntohl(addr6.__u6_addr.__u6_addr32[i]);
|
||||
#elif defined(TARGET_OPENWRT) || defined(TARGET_MUSL)
|
||||
output[i] = ntohl(addr6.__in6_union.__s6_addr32[i]);
|
||||
#elif defined(TARGET_LINUX)
|
||||
output[i] = ntohl(addr6.__in6_u.__u6_addr32[i]);
|
||||
#elif defined(TARGET_ANDROID)
|
||||
output[i] = ntohl(addr6.in6_u.u6_addr32[i]);
|
||||
#endif
|
||||
}
|
||||
|
||||
void NetworkHelper::HostToNetwork(const uint32_t* input, in6_addr& output)
|
||||
{
|
||||
for (int i=0; i<4; i++)
|
||||
#if defined(TARGET_WIN)
|
||||
((uint32_t*)&output.u.Byte[0])[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_OSX) || defined(TARGET_IOS)
|
||||
output.__u6_addr.__u6_addr32[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_OPENWRT) || defined(TARGET_MUSL)
|
||||
output.__in6_union.__s6_addr32[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_LINUX)
|
||||
output.__in6_u.__u6_addr32[i] = htonl(input[i]);
|
||||
#elif defined(TARGET_ANDROID)
|
||||
output.in6_u.u6_addr32[i] = htonl(input[i]);
|
||||
#endif
|
||||
}
|
||||
|
||||
NetworkHelper* NetworkHelper::mInstance = NULL;
|
||||
Mutex NetworkHelper::mGuard;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user