sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/Socket: Fix IPv6 decoding on posix

This commit is contained in:
Lynix 2018-04-01 21:56:45 +02:00
parent c869967928
commit 63ee3ca8d4
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Nazara/Network/Posix/IpAddressImpl.cpp
View File

@ -59,24 +59,13 @@ namespace Nz
IpAddress::IPv6 convertSockaddr6ToIPv6(const in6_addr& addr) IpAddress::IPv6 convertSockaddr6ToIPv6(const in6_addr& addr)
{ {
union byteToInt auto& rawIpV6 = addr.s6_addr;
{
UInt8 b[sizeof(uint32_t)];
uint32_t i;
};
IpAddress::IPv6 ipv6Addr; IpAddress::IPv6 ipv6;
for (unsigned int i = 0; i < 8; ++i)
ipv6[i] = rawIpV6[i * 2] << 8 | rawIpV6[i * 2 + 1];
for (auto i = 0; i < 4; ++i) return ipv6;
{
byteToInt hostOrder;
hostOrder.i = 0;
std::copy(addr.s6_addr + 4 * i, addr.s6_addr + 4 * (i + 1), hostOrder.b);
ipv6Addr[2 * i] = (hostOrder.b[3] << 8) + hostOrder.b[2];
ipv6Addr[2 * i + 1] = (hostOrder.b[1] << 8) + hostOrder.b[0];
}
return ipv6Addr;
} }
} }