X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Finet.cpp;h=f44b1c0b08f0184ed3774e4da25018934b42bdea;hb=cc2e643d6ec3025db3fb6f0a4c1f77af05cf1026;hp=29e24aa7836d6843652da740fb47de576e8db387;hpb=debe1004676d5431e571d9c4361072661dcc88c4;p=libs%2Fnet.git

diff --git a/source/net/inet.cpp b/source/net/inet.cpp
index 29e24aa..f44b1c0 100644
--- a/source/net/inet.cpp
+++ b/source/net/inet.cpp
@@ -1,10 +1,6 @@
-#ifdef WIN32
-#include <winsock2.h>
-#else
-#include <netinet/in.h>
-#endif
-#include <msp/strings/format.h>
+#include "platform_api.h"
 #include "inet.h"
+#include <msp/strings/format.h>
 #include "sockaddr_private.h"
 
 using namespace std;
@@ -12,19 +8,11 @@ using namespace std;
 namespace Msp {
 namespace Net {
 
-InetAddr::InetAddr():
-	port(0)
-{
-	fill(addr, addr+4, 0);
-}
-
 InetAddr::InetAddr(const SysAddr &sa)
 {
 	const sockaddr_in &sai = reinterpret_cast<const sockaddr_in &>(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<const char *>(&sai.sin_addr.s_addr);
+	std::copy(ptr, ptr+4, addr);
 	port = ntohs(sai.sin_port);
 }
 
@@ -34,7 +22,8 @@ SockAddr::SysAddr InetAddr::to_sys() const
 	sa.size = sizeof(sockaddr_in);
 	sockaddr_in &sai = reinterpret_cast<sockaddr_in &>(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<char *>(&sai.sin_addr.s_addr);
+	std::copy(addr, addr+4, ptr);
 	sai.sin_port = htons(port);
 
 	return sa;