GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Damian Korczowski
2021-01-23 21:33:01 +01:00
parent 86b5fa9321
commit 9b300fe074
2 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
Source/Engine/Platform/Win32/Win32Network.cpp
View File

@@ -5,13 +5,13 @@
#include "Engine/Core/Collections/Array.h"
#include <WinSock2.h>
#include <ws2ipdef.h>
#include <ws2tcpip.h>
#include <WS2tcpip.h>
static_assert(sizeof NetworkSocket::Data >= sizeof SOCKET, "NetworkSocket::Data is not big enough to contains SOCKET !");
static_assert(sizeof NetworkEndPoint::Data >= sizeof sockaddr_in6, "NetworkEndPoint::Data is not big enough to contains sockaddr_in6 !");
static const IN6_ADDR v4MappedPrefix = {{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }};
static const IN6_ADDR v4MappedPrefix = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 } };
static WSAData _wsaData;
/*
@@ -21,11 +21,11 @@ static WSAData _wsaData;
static String GetLastErrorMessage()
{
wchar_t *s = NULL;
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, WSAGetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPWSTR)&s, 0, NULL);
wchar_t* s = nullptr;
FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, WSAGetLastError(),
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
reinterpret_cast<LPWSTR>(&s), 0, nullptr);
String str(s);
LocalFree(s);
return str;
@@ -47,7 +47,7 @@ static NetworkIPVersion GetIPVersionFromAddr(const sockaddr& addr)
}
//TODO: can be simplified by casting addr to the right struct and ntohl the port, so we can get rid of getnameinfo
// getnameinfo return a name ( like JimiPC ), not the ip !
// getnameinfo return a name ( like JimiPC ), not the ip!
static bool CreateEndPointFromAddr(sockaddr* addr, NetworkEndPoint& endPoint)
{
uint16 size = GetAddrSize(*addr);
@@ -55,7 +55,7 @@ static bool CreateEndPointFromAddr(sockaddr* addr, NetworkEndPoint& endPoint)
char service[20];
if (getnameinfo(addr, size, name, sizeof name, service, sizeof service, 0) != 0)
{
LOG(Error, "Unable to extract info from sockaddr ! Error : {0}", GetLastErrorMessage().Get());
LOG(Error, "Unable to extract info from sockaddr! Error : {0}", GetLastErrorMessage().Get());
return true;
}
void* paddr;
@@ -67,7 +67,7 @@ static bool CreateEndPointFromAddr(sockaddr* addr, NetworkEndPoint& endPoint)
char ip[INET6_ADDRSTRLEN];
if (inet_ntop(addr->sa_family, paddr, ip, INET6_ADDRSTRLEN) == nullptr)
{
LOG(Error, "Unable to extract address from sockaddr ! Error : {0}", GetLastErrorMessage().Get());
LOG(Error, "Unable to extract address from sockaddr! Error : {0}", GetLastErrorMessage().Get());
return true;
}
endPoint.Address = String(ip);
@@ -83,23 +83,24 @@ static void PrintAddrFromInfo(addrinfoW& info)
for (curr = &info; curr != nullptr; curr = curr->ai_next)
{
void* addr;
if (curr->ai_family == AF_INET) {
sockaddr_in *ipv4 = (struct sockaddr_in *)curr->ai_addr;
if (curr->ai_family == AF_INET) {
sockaddr_in* ipv4 = (struct sockaddr_in*)curr->ai_addr;
addr = &(ipv4->sin_addr);
} else {
sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)curr->ai_addr;
}
else {
sockaddr_in6* ipv6 = (struct sockaddr_in6*)curr->ai_addr;
addr = &(ipv6->sin6_addr);
}
char str[INET6_ADDRSTRLEN];
inet_ntop(curr->ai_family, addr, str, INET6_ADDRSTRLEN);
LOG(Info, "ADDR INFO family : {0} socktype : {1}, proto : {2} address : {3}", curr->ai_family, curr->ai_socktype, curr->ai_protocol, StringAnsi(str).ToString().Get());
LOG(Info, "ADDR INFO family : {0} socktype : {1}, proto : {2} address : {3}", curr->ai_family, curr->ai_socktype, curr->ai_protocol, StringAnsi(str).ToString().Get());
}
}
bool Win32Network::Init()
{
if (WSAStartup(MAKEWORD(2,0), &_wsaData) != 0)
if (WSAStartup(MAKEWORD(2, 0), &_wsaData) != 0)
return true;
return false;
}
@@ -109,45 +110,45 @@ void Win32Network::Exit()
WSACleanup();
}
bool Win32Network::CreateSocket(NetworkSocket& netsock, NetworkSocketCreateSettings& settings)
bool Win32Network::CreateSocket(NetworkSocket& socket, NetworkSocketCreateSettings& settings)
{
netsock.Protocol = settings.Protocol;
netsock.IPVersion = settings.IPVersion;
socket.Protocol = settings.Protocol;
socket.IPVersion = settings.IPVersion;
const uint8 family = settings.IPVersion == NetworkIPVersion::IPv6 ? AF_INET6 : AF_INET;
const uint8 stype = settings.Protocol == NetworkProtocolType::Tcp ? SOCK_STREAM : SOCK_DGRAM;
const uint8 proto = settings.Protocol == NetworkProtocolType::Tcp ? IPPROTO_TCP : IPPROTO_UDP;
SOCKET sock;
if ((sock = socket(family, stype, proto)) == INVALID_SOCKET)
if ((sock = ::socket(family, stype, proto)) == INVALID_SOCKET)
{
LOG(Error, "Can't create native socket ! Error : {0}", GetLastErrorMessage().Get());
LOG(Error, "Can't create native socket! Error : {0}", GetLastErrorMessage().Get());
return true;
}
memcpy(netsock.Data, &sock, sizeof sock);
memcpy(socket.Data, &sock, sizeof sock);
DWORD dw = 0;
if (family == AF_INET6 && setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&dw, sizeof dw) == SOCKET_ERROR)
{
LOG(Warning, "System does not support dual stacking socket ! Error : {0}", GetLastErrorMessage().Get());
LOG(Warning, "System does not support dual stacking socket! Error : {0}", GetLastErrorMessage().Get());
}
unsigned long value = 1;
if (settings.ReuseAddress && setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&value, sizeof value) == SOCKET_ERROR)
{
LOG(Warning, "Can't set socket option to SO_REUSEADDR ! Error : {0}", GetLastErrorMessage().Get());
LOG(Warning, "Can't set socket option to SO_REUSEADDR! Error : {0}", GetLastErrorMessage().Get());
}
if (settings.Broadcast && settings.Protocol == NetworkProtocolType::Udp)
{
if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char*)&value, sizeof value) == SOCKET_ERROR)
{
LOG(Warning, "Can't set socket option to SO_BROADCAST ! Error : {0}", GetLastErrorMessage().Get());
LOG(Warning, "Can't set socket option to SO_BROADCAST! Error : {0}", GetLastErrorMessage().Get());
}
}
else if (settings.Broadcast)
LOG(Warning, "Can't set socket option to SO_BROADCAST ! The socket must use UDP protocol. Error : {0}", GetLastErrorMessage().Get());
LOG(Warning, "Can't set socket option to SO_BROADCAST! The socket must use UDP protocol. Error : {0}", GetLastErrorMessage().Get());
if (ioctlsocket(sock, FIONBIO, &value) == SOCKET_ERROR)
{
LOG(Error, "Can't set socket to NON-BLOCKING type ! Error : {0}", GetLastErrorMessage().Get());
LOG(Error, "Can't set socket to NON-BLOCKING type! Error : {0}", GetLastErrorMessage().Get());
return true; // Support using blocking socket , need to test it
}
//DEBUG
@@ -165,7 +166,7 @@ bool Win32Network::DestroySocket(NetworkSocket& socket)
LOG(Info, "Deleting socket : {0}", sock); //TODO: DEBUG
return false;
}
LOG(Warning, "Unable to delete socket INVALID_SOCKET ! Socket : {0}", sock);
LOG(Warning, "Unable to delete socket INVALID_SOCKET! Socket : {0}", sock);
return true;
}
@@ -175,7 +176,7 @@ bool Win32Network::ConnectSocket(NetworkSocket& socket, NetworkEndPoint& endPoin
const uint16 size = GetAddrSizeFromEP(endPoint);
if (connect(*(SOCKET*)socket.Data, (const sockaddr*)endPoint.Data, size) == SOCKET_ERROR)
{
LOG(Error, "Unable to connect socket to address ! Socket : {0} Address : {1} Port : {2}", *(SOCKET*)socket.Data, endPoint.Address.Get(), endPoint.Port.Get());
LOG(Error, "Unable to connect socket to address! Socket : {0} Address : {1} Port : {2}", *(SOCKET*)socket.Data, endPoint.Address.Get(), endPoint.Port.Get());
return true;
}
return false;
@@ -185,7 +186,7 @@ bool Win32Network::BindSocket(NetworkSocket& socket, NetworkEndPoint& endPoint)
{
if (socket.IPVersion != endPoint.IPVersion)
{
LOG(Error, "Can't bind socket to end point, Socket.IPVersion != EndPoint.IPVersion ! Socket : {0}", *(SOCKET*)socket.Data);
LOG(Error, "Can't bind socket to end point, Socket.IPVersion != EndPoint.IPVersion! Socket : {0}", *(SOCKET*)socket.Data);
return true;
}
@@ -194,11 +195,11 @@ bool Win32Network::BindSocket(NetworkSocket& socket, NetworkEndPoint& endPoint)
LOG(Info, "BIND : EndPoint family : {0}", addr->sa_family);
if (bind(*(SOCKET*)socket.Data, (const sockaddr*)endPoint.Data, size) == SOCKET_ERROR)
{
LOG(Error, "Unable to bind socket ! Socket : {0} Address : {1} Port : {2} Error : {3}", *(SOCKET*)socket.Data, endPoint.Address.Get(), endPoint.Port.Get(), GetLastErrorMessage().Get());
LOG(Error, "Unable to bind socket! Socket : {0} Address : {1} Port : {2} Error : {3}", *(SOCKET*)socket.Data, endPoint.Address.Get(), endPoint.Port.Get(), GetLastErrorMessage().Get());
return true;
}
//DEBUG
LOG(Info, "Binding socket ! Socket : {0} Address : {1} Port : {2}", *(SOCKET*)socket.Data, endPoint.Address.Get(), endPoint.Port.Get());
LOG(Info, "Binding socket! Socket : {0} Address : {1} Port : {2}", *(SOCKET*)socket.Data, endPoint.Address.Get(), endPoint.Port.Get());
return false;
}
@@ -206,14 +207,14 @@ bool Win32Network::Accept(NetworkSocket& serverSock, NetworkSocket& newSock, Net
{
if (serverSock.Protocol != NetworkProtocolType::Tcp)
{
LOG(Warning, "Can't accept connection on UDP socket ! Socket : {0}", *(SOCKET*)serverSock.Data);
LOG(Warning, "Can't accept connection on UDP socket! Socket : {0}", *(SOCKET*)serverSock.Data);
return true;
}
SOCKET sock;
sockaddr addr;
if ((sock = accept(*(SOCKET*)serverSock.Data, &addr, nullptr)) == INVALID_SOCKET)
{
LOG(Warning, "Unable to accept incoming connection ! Socket : {0} Error : {1}", *(SOCKET*)serverSock.Data, GetLastErrorMessage().Get());
LOG(Warning, "Unable to accept incoming connection! Socket : {0} Error : {1}", *(SOCKET*)serverSock.Data, GetLastErrorMessage().Get());
return true;
}
memcpy(newSock.Data, &sock, sizeof sock);
@@ -231,7 +232,7 @@ bool Win32Network::IsReadable(NetworkSocket& socket, uint64* size)
unsigned long value;
if (ioctlsocket(*(SOCKET*)socket.Data, FIONREAD, &value) != 0)
{
LOG(Error, "Unable to query socket for readability ! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetLastErrorMessage().Get());
LOG(Error, "Unable to query socket for readability! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetLastErrorMessage().Get());
return true;
}
*size = value;
@@ -242,7 +243,7 @@ int32 Win32Network::WriteSocket(NetworkSocket socket, byte* data, uint32 length,
{
if (socket.IPVersion != endPoint->IPVersion)
{
LOG(Error, "Unable to send data, Socket.IPVersion != EndPoint.IPVersion ! Socket : {0}", *(SOCKET*)socket.Data);
LOG(Error, "Unable to send data, Socket.IPVersion != EndPoint.IPVersion! Socket : {0}", *(SOCKET*)socket.Data);
return 0;
}
uint32 size;
@@ -250,7 +251,7 @@ int32 Win32Network::WriteSocket(NetworkSocket socket, byte* data, uint32 length,
{
if ((size = send(*(SOCKET*)socket.Data, (const char*)data, length, 0)) == SOCKET_ERROR)
{
LOG(Error, "Unable to send data ! Socket : {0} Data Length : {1} Error : {2}", *(SOCKET*)socket.Data, length, GetLastErrorMessage().Get());
LOG(Error, "Unable to send data! Socket : {0} Data Length : {1} Error : {2}", *(SOCKET*)socket.Data, length, GetLastErrorMessage().Get());
return -1;
}
}
@@ -258,14 +259,14 @@ int32 Win32Network::WriteSocket(NetworkSocket socket, byte* data, uint32 length,
{
if ((size = sendto(*(SOCKET*)socket.Data, (const char*)data, length, 0, (const sockaddr*)endPoint->Data, GetAddrSizeFromEP(*endPoint))) == SOCKET_ERROR)
{
LOG(Error, "Unable to send data ! Socket : {0} Address : {1} Port : {2} Data Length : {3} Error : {4}", *(SOCKET*)socket.Data, endPoint->Address, endPoint->Port, length, GetLastErrorMessage().Get());
LOG(Error, "Unable to send data! Socket : {0} Address : {1} Port : {2} Data Length : {3} Error : {4}", *(SOCKET*)socket.Data, endPoint->Address, endPoint->Port, length, GetLastErrorMessage().Get());
return -1;
}
}
else
{
//TODO: better explanation
LOG(Error, "Unable to send data ! Socket : {0} Data Length : {1}", *(SOCKET*)socket.Data, length);
LOG(Error, "Unable to send data! Socket : {0} Data Length : {1}", *(SOCKET*)socket.Data, length);
return -1;
}
return size;
@@ -279,9 +280,9 @@ int32 Win32Network::ReadSocket(NetworkSocket socket, byte* buffer, uint32 buffer
uint32 size;
if (endPoint == nullptr) // TCP
{
if ((size = recv(*(SOCKET*)socket.Data, (char*) buffer, bufferSize, 0)) == SOCKET_ERROR)
if ((size = recv(*(SOCKET*)socket.Data, (char*)buffer, bufferSize, 0)) == SOCKET_ERROR)
{
LOG(Error, "Unable to read data ! Socket : {0} Buffer Size : {1} Error : {2}", *(SOCKET*)socket.Data, bufferSize, GetLastErrorMessage().Get());
LOG(Error, "Unable to read data! Socket : {0} Buffer Size : {1} Error : {2}", *(SOCKET*)socket.Data, bufferSize, GetLastErrorMessage().Get());
return -1;
}
}
@@ -289,9 +290,9 @@ int32 Win32Network::ReadSocket(NetworkSocket socket, byte* buffer, uint32 buffer
{
int32 addrsize = sizeof sockaddr_in6;
sockaddr_in6 addr;
if ((size = recvfrom(*(SOCKET*)socket.Data, (char*) buffer, bufferSize, 0, (sockaddr*)&addr, &addrsize)) == SOCKET_ERROR)
if ((size = recvfrom(*(SOCKET*)socket.Data, (char*)buffer, bufferSize, 0, (sockaddr*)&addr, &addrsize)) == SOCKET_ERROR)
{
LOG(Error, "Unable to read data ! Socket : {0} Buffer Size : {1} Error : {2}", *(SOCKET*)socket.Data, bufferSize, GetLastErrorMessage().Get());
LOG(Error, "Unable to read data! Socket : {0} Buffer Size : {1} Error : {2}", *(SOCKET*)socket.Data, bufferSize, GetLastErrorMessage().Get());
return -1;
}
if (CreateEndPointFromAddr((sockaddr*)&addr, *endPoint))
@@ -305,7 +306,7 @@ bool Win32Network::CreateEndPoint(String* address, String* port, NetworkIPVersio
{
int status;
addrinfoW hints;
addrinfoW *info;
addrinfoW* info;
//DEBUG
LOG(Info, "Searching available adresses for {0} : {1}", address == nullptr ? String("nullptr").Get() : address->Get(),
port == nullptr ? String("nullptr").Get() : port->Get());
@@ -321,19 +322,19 @@ bool Win32Network::CreateEndPoint(String* address, String* port, NetworkIPVersio
// paddr = nullptr don't work with this func
if ((status = GetAddrInfoW(address == nullptr ? nullptr : address->Get(), port->Get(), &hints, &info)) != 0)
{
LOG(Error, "Unable to query info for address : {0} Error : {1} !", address != nullptr ? address->Get() : String("ANY").Get(), gai_strerror(status)); //TODO: address can be NULL
LOG(Error, "Unable to query info for address : {0} Error : {1}", address != nullptr ? address->Get() : String("ANY").Get(), gai_strerror(status)); //TODO: address can be NULL
return true;
}
if (info == nullptr)
{
LOG(Error, "Unable to resolve address ! Address : {0}", address != nullptr ? address->Get() : String("ANY").Get());//TODO: address can be NULL
LOG(Error, "Unable to resolve address! Address : {0}", address != nullptr ? address->Get() : String("ANY").Get());//TODO: address can be NULL
return true;
}
//DEBUG
PrintAddrFromInfo(*info);
// We are taking the first addr in the linked list
if (CreateEndPointFromAddr(info->ai_addr, endPoint))
{
@@ -351,7 +352,7 @@ NetworkEndPoint Win32Network::RemapEndPointToIPv6(NetworkEndPoint endPoint)
{
if (endPoint.IPVersion == NetworkIPVersion::IPv6)
{
LOG(Warning, "Unable to remap EndPoint, already in IPv6 format !");
LOG(Warning, "Unable to remap EndPoint, already in IPv6 format!");
return endPoint;
}
@@ -369,6 +370,6 @@ NetworkEndPoint Win32Network::RemapEndPointToIPv6(NetworkEndPoint endPoint)
memcpy(&addr6->sin6_addr.u.Byte[12], &addr4->sin_addr, 4); // :::::FFFF:XXXX:XXXX X=IPv4
pv6.IPVersion = NetworkIPVersion::IPv6;
pv6.Port = endPoint.Port;
return pv6;
}