From c9d1cbb9325637c1dea59969d15c5e1fac395df4 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 10 Aug 2011 22:30:29 +0300 Subject: [PATCH] Fix storage order of InetAddr::addr --- source/net/inet.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/net/inet.cpp b/source/net/inet.cpp index 29e24aa..c78ea61 100644 --- a/source/net/inet.cpp +++ b/source/net/inet.cpp @@ -21,10 +21,8 @@ InetAddr::InetAddr(): InetAddr::InetAddr(const SysAddr &sa) { const sockaddr_in &sai = reinterpret_cast(sa.addr); - addr[0] = sai.sin_addr.s_addr>>24; - addr[1] = sai.sin_addr.s_addr>>16; - addr[2] = sai.sin_addr.s_addr>>8; - addr[3] = sai.sin_addr.s_addr; + const char *ptr = reinterpret_cast(&sai.sin_addr.s_addr); + std::copy(ptr, ptr+4, addr); port = ntohs(sai.sin_port); } @@ -34,7 +32,8 @@ SockAddr::SysAddr InetAddr::to_sys() const sa.size = sizeof(sockaddr_in); sockaddr_in &sai = reinterpret_cast(sa.addr); sai.sin_family = AF_INET; - sai.sin_addr.s_addr = (addr[0]<<24) | (addr[1]<<16) | (addr[2]<<8) | (addr[3]); + char *ptr = reinterpret_cast(&sai.sin_addr.s_addr); + std::copy(addr, addr+4, ptr); sai.sin_port = htons(port); return sa; -- 2.43.0