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-05-29 19:41:39 +02:00
parent 3c939bbf40
commit 6719e0b326
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Engine/Networking/NetworkConfig.h
View File

@@ -22,10 +22,18 @@ public:
public:
API_FIELD()
uint16 ConnectionsLimit = 32;
/// <summary>
/// Address used to connect to or listen at.
/// Set it to "any" when you want to listen at all available addresses.
/// </summary>
/// <remarks>Only IPv4 is supported.</remarks>
API_FIELD()
String Address = String("127.0.0.1");
/// <summary>
/// The port to connect to or listen at.
/// </summary>
API_FIELD()
uint16 Port = 7777;

9
Source/Engine/Networking/NetworkManager.cpp
View File

@@ -22,8 +22,8 @@ int NetworkManager::Initialize(const NetworkConfig& config)
{
// Validate the address for listen/connect
NetworkEndPoint endPoint = {};
const bool isEndPointValid = NetworkBase::CreateEndPoint(config.Address, String("7777"), NetworkIPVersion::IPv4, endPoint, false);
ASSERT(config.Address == String("any") || isEndPointValid);
const bool isValidEndPoint = NetworkBase::CreateEndPoint(config.Address, String("7777"), NetworkIPVersion::IPv4, endPoint, false);
ASSERT(config.Address == String("any") || isValidEndPoint);
// Alloc new host
const int hostId = Hosts.Count();
@@ -48,7 +48,7 @@ bool NetworkManager::Listen(const int hostId)
ASSERT(Hosts[hostId].IsValid());
NetworkHost& host = Hosts[hostId];
LOG(Info, "NetworkManager starting to listen on address = any:{0}", host.Config.Port);
LOG(Info, "NetworkManager starting to listen on address = {0}:{1}", host.Config.Address, host.Config.Port);
return host.NetworkDriver->Listen();
}
@@ -57,9 +57,8 @@ bool NetworkManager::Connect(const int hostId)
{
ASSERT(Hosts[hostId].IsValid());
NetworkHost& host = Hosts[hostId];
LOG(Info, "Connecting to 127.0.0.1:{0}...", host.Config.Port); // TODO: Proper IP address
LOG(Info, "Connecting to {0}:{1}...", host.Config.Address, host.Config.Port);
// TODO: Assert address/endpoint
return host.NetworkDriver->Connect();
}