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

Merge branch 'network' of git://github.com/jb-perrier/FlaxEngine into 1.1

Browse Source 
# Conflicts:
#	Source/Engine/Platform/Win32/Win32Network.cpp
This commit is contained in:
Wojtek Figat
2021-03-08 09:30:25 +01:00
parent 0a59c61100 78c5644de0
commit 85c29c3d2b
4 changed files with 178 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Engine/Platform/Base/NetworkBase.cpp
View File

@@ -62,6 +62,16 @@ bool NetworkBase::IsWriteable(NetworkSocket& socket)
return true;
}
bool NetworkBase::CreateSocketGroup(uint32 capacity, NetworkSocketGroup& group)
{
return false;
}
bool NetworkBase::DestroySocketGroup(NetworkSocketGroup& group)
{
return true;
}
int32 NetworkBase::Poll(NetworkSocketGroup& group)
{
return -1;
@@ -77,6 +87,21 @@ int32 NetworkBase::AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& so
return -1;
}
bool NetworkBase::GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket)
{
return true;
}
void NetworkBase::RemoveSocketFromGroup(NetworkSocketGroup& group, uint32 index)
{
}
bool NetworkBase::RemoveSocketFromGroup(NetworkSocketGroup& group, NetworkSocket& socket)
{
return true;
}
void NetworkBase::ClearGroup(NetworkSocketGroup& group)
{
group.Count = 0;
@@ -92,7 +117,7 @@ int32 NetworkBase::ReadSocket(NetworkSocket socket, byte* buffer, uint32 bufferS
return -1;
}
bool NetworkBase::CreateEndPoint(String* address, String* port, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable)
bool NetworkBase::CreateEndPoint(NetworkAddress& address, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable)
{
return true;
}

61
Source/Engine/Platform/Base/NetworkBase.h
View File

@@ -6,7 +6,6 @@
#include "Engine/Core/Types/String.h"
API_INJECT_CPP_CODE("#include \"Engine/Platform/Network.h\"");
#define SOCKGROUP_MAXCOUNT 64
#define SOCKGROUP_ITEMSIZE 16
enum class FLAXENGINE_API NetworkProtocol
@@ -36,11 +35,15 @@ struct FLAXENGINE_API NetworkSocket
byte Data[8] = {};
};
struct FLAXENGINE_API NetworkAddress
{
String Address;
String Port;
};
struct FLAXENGINE_API NetworkEndPoint
{
NetworkIPVersion IPVersion = NetworkIPVersion::Undefined;
String Address;
String Port;
byte Data[28] = {};
};
@@ -77,7 +80,9 @@ enum class FLAXENGINE_API NetworkSocketOption
/// <summary>Enables IPv6/Ipv4 dual-stacking, UDP/TCP.</summary>
IPv6Only,
/// <summary>Retrieve the current path MTU, the socket must be connected UDP/TCP.</summary>
Mtu
Mtu,
// <summary>Socket type, DGRAM, STREAM ..</summary>
Type
};
struct FLAXENGINE_API NetworkSocketState
@@ -92,7 +97,8 @@ struct FLAXENGINE_API NetworkSocketState
struct FLAXENGINE_API NetworkSocketGroup
{
uint32 Count = 0;
byte Data[SOCKGROUP_MAXCOUNT * SOCKGROUP_ITEMSIZE] = {};
uint32 Capacity = 0;
byte *Data;
};
class FLAXENGINE_API NetworkBase
@@ -197,6 +203,21 @@ public:
/// <returns>Returns true when data can be written. Otherwise false.</returns>
static bool IsWriteable(NetworkSocket& socket);
/// <summary>
/// Creates a socket group. It allocate memory based on the desired capacity.
/// </summary>
/// <param name="capacity">The group capacity (fixed).</param>
/// <param name="group">The group.</param>
/// <returns>Returns true on error, otherwise false.</returns>
static bool CreateSocketGroup(uint32 capacity, NetworkSocketGroup& group);
/// <summary>
/// Destroy the socket group, and free the allocated memory.
/// </summary>
/// <param name="group">The group.</param>
/// <returns>Returns true if the group is already destroyed, otherwise false.</returns>
static bool DestroySocketGroup(NetworkSocketGroup& group);
/// <summary>
/// Updates sockets states.
/// </summary>
@@ -221,6 +242,31 @@ public:
/// <returns>Returns the socket index in group or -1 on error.</returns>
static int32 AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& socket);
/// <summary>
/// Gets a socket by index.
/// Some data like socket IPVersion might be undefined.
/// </summary>
/// <param name="group">The group.</param>
/// <param name="index">The index.</param>
/// <param name="socket">The returned socket.</param>
/// <returns>Returns true on error, otherwise false.</returns>
static bool GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket);
/// <summary>
/// Removes the socket at the specified index.
/// </summary>
/// <param name="group">The group.</param>
/// <param name="index">The index.</param>
static void RemoveSocketFromGroup(NetworkSocketGroup& group, uint32 index);
/// <summary>
/// Removes the socket if present.
/// </summary>
/// <param name="group">The group.</param>
/// <param name="socket">The socket.</param>
/// <returns>Returns true if the socket is not found, otherwise false.</returns>
static bool RemoveSocketFromGroup(NetworkSocketGroup& group, NetworkSocket& socket);
/// <summary>
/// Clears the socket group.
/// </summary>
@@ -250,13 +296,12 @@ public:
/// <summary>
/// Creates an end point.
/// </summary>
/// <param name="address">The address (hostname, IPv4 or IPv6).</param>
/// <param name="port">The port.</param>
/// <param name="address">The address.</param>
/// <param name="ipv">The ip version.</param>
/// <param name="endPoint">The created end point.</param>
/// <param name="bindable">True if the end point will be connected or binded.</param>
/// <returns>Returns true on error, otherwise false.</returns>
static bool CreateEndPoint(String* address, String* port, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable = false);
static bool CreateEndPoint(NetworkAddress& address, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable = true);
/// <summary>
/// Remaps an ipv4 end point to an ipv6 one.

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

@@ -11,6 +11,7 @@
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_assert(SOCKGROUP_ITEMSIZE >= sizeof(pollfd), "SOCKGROUP_ITEMSIZE macro is not big enough to contains pollfd !");
// @formatter:off
static const IN6_ADDR v4MappedPrefix = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -18,6 +19,8 @@ static const IN6_ADDR v4MappedPrefix = { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0
// @formatter:on
/*
* Todo :
* Return precise errors so user can understand what's happening ( disconnected, ect ... )
* Known issues :
* Even if dualstacking is enabled it's not possible to bind an Ipv4mappedIPv6 endpoint. windows limitation
*/
@@ -81,10 +84,8 @@ static bool CreateEndPointFromAddr(sockaddr* addr, NetworkEndPoint& endPoint)
LOG(Error, "Unable to extract address from sockaddr! Error : {0}", GetLastErrorMessage());
return true;
}
endPoint.Address = String(ip);
char strPort[6];
_itoa(port, strPort, 10);
endPoint.Port = String(strPort);
endPoint.IPVersion = GetIPVersionFromAddr(*addr);
memcpy(endPoint.Data, addr, size);
return false;
@@ -133,6 +134,7 @@ static void TranslateSockOptToNative(NetworkSocketOption option, int32* level, i
SOCKOPT(NetworkSocketOption::NoDelay, IPPROTO_TCP, TCP_NODELAY)
SOCKOPT(NetworkSocketOption::IPv6Only, IPPROTO_IPV6, IPV6_V6ONLY)
SOCKOPT(NetworkSocketOption::Mtu, IPPROTO_IP , IP_MTU)
SOCKOPT(NetworkSocketOption::Type, SOL_SOCKET, SO_TYPE)
}
}
@@ -225,7 +227,7 @@ bool Win32Network::ConnectSocket(NetworkSocket& socket, NetworkEndPoint& endPoin
int error = WSAGetLastError();
if (error == WSAEWOULDBLOCK)
return false;
LOG(Error, "Unable to connect socket to address! Socket : {0} Address : {1} Port : {2} Error : {3}", *(SOCKET*)socket.Data, endPoint.Address, endPoint.Port, GetErrorMessage(error));
LOG(Error, "Unable to connect socket to address! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetErrorMessage(error));
return true;
}
return false;
@@ -242,7 +244,7 @@ bool Win32Network::BindSocket(NetworkSocket& socket, NetworkEndPoint& endPoint)
const uint16 size = endPoint.IPVersion == NetworkIPVersion::IPv6 ? sizeof sockaddr_in6 : sizeof sockaddr_in;
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, endPoint.Port, GetLastErrorMessage());
LOG(Error, "Unable to bind socket! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetLastErrorMessage());
return true;
}
return false;
@@ -252,7 +254,7 @@ bool Win32Network::Listen(NetworkSocket& socket, uint16 queueSize)
{
if (listen(*(SOCKET*)socket.Data, (int32)queueSize) == SOCKET_ERROR)
{
LOG(Error, "Unable to listen ! Socket : {0} Error : {1}", GetLastErrorMessage());
LOG(Error, "Unable to listen ! Socket : {0} Error : {1}", *(SOCKET*)socket.Data, GetLastErrorMessage());
return true;
}
return false;
@@ -321,6 +323,28 @@ bool Win32Network::IsWriteable(NetworkSocket& socket)
return false;
}
bool Win32Network::CreateSocketGroup(uint32 capacity, NetworkSocketGroup& group)
{
if (!(group.Data = (byte*)Platform::Allocate(capacity * SOCKGROUP_ITEMSIZE, 16)))
{
LOG(Error, "Unable to malloc NetworkSocketGroup::Data ! Size : {0}", capacity * SOCKGROUP_ITEMSIZE);
return true;
}
group.Capacity = capacity;
for(int i = 0; i < (int)group.Capacity; i++)
((pollfd*)&group.Data[i * SOCKGROUP_ITEMSIZE])->fd = -1;
return false;
}
bool Win32Network::DestroySocketGroup(NetworkSocketGroup& group)
{
if (!group.Data)
return true;
Platform::Free(group.Data);
return false;
}
int32 Win32Network::Poll(NetworkSocketGroup& group)
{
int32 pollret = WSAPoll((pollfd*)group.Data, group.Count, 0);
@@ -331,7 +355,7 @@ int32 Win32Network::Poll(NetworkSocketGroup& group)
bool Win32Network::GetSocketState(NetworkSocketGroup& group, uint32 index, NetworkSocketState& state)
{
if (index >= SOCKGROUP_MAXCOUNT)
if (index >= group.Capacity)
return true;
pollfd* pollptr = (pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE];
memset(&state, 0, sizeof state);
@@ -350,18 +374,70 @@ bool Win32Network::GetSocketState(NetworkSocketGroup& group, uint32 index, Netwo
int32 Win32Network::AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& socket)
{
if (group.Count >= SOCKGROUP_MAXCOUNT)
if (group.Count >= group.Capacity)
return -1;
pollfd pollinfo;
pollinfo.fd = *(SOCKET*)socket.Data;
pollinfo.events = POLLRDNORM | POLLWRNORM;
*(pollfd*)&group.Data[group.Count * SOCKGROUP_ITEMSIZE] = pollinfo;
group.Count++;
return group.Count - 1;
for(int i = 0; i < (int)group.Capacity; i++)
{
if (((pollfd*)&group.Data[i * SOCKGROUP_ITEMSIZE])->fd == -1)
{
*(pollfd*)&group.Data[i * SOCKGROUP_ITEMSIZE] = pollinfo;
group.Count++;
return i;
}
}
return -1;
}
bool Win32Network::GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket)
{
if (index >= group.Capacity)
return true;
SOCKET s = ((pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE])->fd;
memcpy(socket->Data, &s, sizeof s);
int32 value;
if (GetSocketOption(*socket, NetworkSocketOption::Type, &value))
return true;
if (value == SOCK_DGRAM)
socket->Protocol = NetworkProtocol::Udp;
else if (value == SOCK_STREAM)
socket->Protocol = NetworkProtocol::Tcp;
else
socket->Protocol = NetworkProtocol::Undefined;
return false;
}
void Win32Network::RemoveSocketFromGroup(NetworkSocketGroup& group, uint32 index)
{
if (((pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE])->fd != -1)
{
((pollfd*)&group.Data[index * SOCKGROUP_ITEMSIZE])->fd = -1;
group.Count--;
}
}
bool Win32Network::RemoveSocketFromGroup(NetworkSocketGroup& group, NetworkSocket& socket)
{
for(int i = 0; i < (int)group.Capacity; i++)
{
if (((pollfd*)&group.Data[i * SOCKGROUP_ITEMSIZE])->fd == *(SOCKET*)&socket.Data)
{
((pollfd*)&group.Data[i * SOCKGROUP_ITEMSIZE])->fd = -1;
group.Count--;
return false;
}
}
return true;
}
void Win32Network::ClearGroup(NetworkSocketGroup& group)
{
for(int i = 0; i < (int)group.Capacity; i++)
((pollfd*)&group.Data[i * SOCKGROUP_ITEMSIZE])->fd = -1;
group.Count = 0;
}
@@ -385,7 +461,7 @@ 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());
LOG(Error, "Unable to send data! Socket : {0} Data Length : {1} Error : {2}", *(SOCKET*)socket.Data, length, GetLastErrorMessage());
return -1;
}
}
@@ -401,7 +477,7 @@ int32 Win32Network::WriteSocket(NetworkSocket socket, byte* data, uint32 length,
int32 Win32Network::ReadSocket(NetworkSocket socket, byte* buffer, uint32 bufferSize, NetworkEndPoint* endPoint)
{
uint32 size;
if (endPoint == nullptr) // TCP
if (endPoint == nullptr)
{
if ((size = recv(*(SOCKET*)socket.Data, (char*)buffer, bufferSize, 0)) == SOCKET_ERROR)
{
@@ -412,7 +488,7 @@ int32 Win32Network::ReadSocket(NetworkSocket socket, byte* buffer, uint32 buffer
return -1;
}
}
else // UDP
else
{
int32 addrsize = sizeof sockaddr_in6;
sockaddr_in6 addr;
@@ -427,7 +503,7 @@ int32 Win32Network::ReadSocket(NetworkSocket socket, byte* buffer, uint32 buffer
return size;
}
bool Win32Network::CreateEndPoint(String* address, String* port, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable)
bool Win32Network::CreateEndPoint(NetworkAddress& address, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable)
{
int status;
addrinfoW hints;
@@ -440,15 +516,15 @@ bool Win32Network::CreateEndPoint(String* address, String* port, NetworkIPVersio
hints.ai_flags = AI_PASSIVE;
// consider using NUMERICHOST/NUMERICSERV if address is a valid Ipv4 or IPv6 so we can skip some look up ( potentially slow when resolving host names )
if ((status = GetAddrInfoW(address == nullptr ? nullptr : address->Get(), port->Get(), &hints, &info)) != 0)
if ((status = GetAddrInfoW(address.Address == String::Empty ? nullptr : address.Address.Get(), address.Port == String::Empty ? nullptr : address.Port.Get(), &hints, &info)) != 0)
{
LOG(Error, "Unable to query info for address : {0} Error : {1}", address ? address->Get() : TEXT("ANY"), gai_strerror(status));
LOG(Error, "Unable to query info for address : {0} Error : {1}", address.Address != String::Empty ? address.Address : String("ANY"), gai_strerror(status));
return true;
}
if (info == nullptr)
{
LOG(Error, "Unable to resolve address! Address : {0}", address ? address->Get() : TEXT("ANY"));
LOG(Error, "Unable to resolve address! Address : {0}", address.Address != String::Empty ? address.Address : String("ANY"));
return true;
}
@@ -483,7 +559,6 @@ NetworkEndPoint Win32Network::RemapEndPointToIPv6(NetworkEndPoint endPoint)
addr6->sin6_port = addr4->sin_port;
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;
}

10
Source/Engine/Platform/Win32/Win32Network.h
View File

@@ -8,9 +8,6 @@
class FLAXENGINE_API Win32Network : public NetworkBase
{
friend NetworkEndPoint;
friend NetworkSocket;
public:
// [NetworkBase]
static bool CreateSocket(NetworkSocket& socket, NetworkProtocol proto, NetworkIPVersion ipv);
@@ -25,13 +22,18 @@ public:
static bool Accept(NetworkSocket& serverSock, NetworkSocket& newSock, NetworkEndPoint& newEndPoint);
static bool IsReadable(NetworkSocket& socket);
static bool IsWriteable(NetworkSocket& socket);
static bool CreateSocketGroup(uint32 capacity, NetworkSocketGroup& group);
static bool DestroySocketGroup(NetworkSocketGroup& group);
static int32 Poll(NetworkSocketGroup& group);
static bool GetSocketState(NetworkSocketGroup& group, uint32 index, NetworkSocketState& state);
static int32 AddSocketToGroup(NetworkSocketGroup& group, NetworkSocket& socket);
static bool GetSocketFromGroup(NetworkSocketGroup& group, uint32 index, NetworkSocket* socket);
static void RemoveSocketFromGroup(NetworkSocketGroup& group, uint32 index);
static bool RemoveSocketFromGroup(NetworkSocketGroup& group, NetworkSocket& socket);
static void ClearGroup(NetworkSocketGroup& group);
static int32 WriteSocket(NetworkSocket socket, byte* data, uint32 length, NetworkEndPoint* endPoint = nullptr);
static int32 ReadSocket(NetworkSocket socket, byte* buffer, uint32 bufferSize, NetworkEndPoint* endPoint = nullptr);
static bool CreateEndPoint(String* address, String* port, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable = false);
static bool CreateEndPoint(NetworkAddress& address, NetworkIPVersion ipv, NetworkEndPoint& endPoint, bool bindable = true);
static NetworkEndPoint RemapEndPointToIPv6(NetworkEndPoint endPoint);
};