From 66daa6833334f25f4ba3df4db0539485378b7fa1 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 10 Nov 2015 13:35:09 +0100 Subject: [PATCH] Network: Little clean up Former-commit-id: 594fbfbbe9051ac4ec7b647f9e2eb1a74d640a69 --- include/Nazara/Network/IpAddress.hpp | 4 ++-- src/Nazara/Network/Win32/IpAddressImpl.cpp | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/Nazara/Network/IpAddress.hpp b/include/Nazara/Network/IpAddress.hpp index e7ae9bd23..5ac902a66 100644 --- a/include/Nazara/Network/IpAddress.hpp +++ b/include/Nazara/Network/IpAddress.hpp @@ -91,8 +91,8 @@ namespace Nz IpAddress address; String canonicalName; int flags; - int family; - int socketType; + int family; //< TODO: NetProtocol + int socketType; //< TODO: SocketType }; } diff --git a/src/Nazara/Network/Win32/IpAddressImpl.cpp b/src/Nazara/Network/Win32/IpAddressImpl.cpp index 360513ff5..5715859ca 100644 --- a/src/Nazara/Network/Win32/IpAddressImpl.cpp +++ b/src/Nazara/Network/Win32/IpAddressImpl.cpp @@ -96,7 +96,7 @@ namespace Nz } } - return IpAddress(); + return IpAddress::Invalid; } IpAddress IpAddressImpl::FromAddrinfo(const addrinfoW* info) @@ -118,7 +118,7 @@ namespace Nz } } - return IpAddress(); + return IpAddress::Invalid; } IpAddress IpAddressImpl::FromSockAddr(const sockaddr* address) @@ -132,7 +132,7 @@ namespace Nz return FromSockAddr(reinterpret_cast(address)); } - return IpAddress(); + return IpAddress::Invalid; } IpAddress IpAddressImpl::FromSockAddr(const sockaddr_in* addressv4) @@ -238,8 +238,6 @@ namespace Nz for (unsigned int i = 0; i < 8; ++i) socketAddress->sin6_addr.u.Word[i] = htons(address[i]); - IN6_ADDR any = in6addr_any; - return sizeof(sockaddr_in6); }