From 6719e0b326996d43a195f8f80902aa253628a56a Mon Sep 17 00:00:00 2001 From: Damian Korczowski Date: Sat, 29 May 2021 19:41:39 +0200 Subject: [PATCH] Cleanup --- Source/Engine/Networking/NetworkConfig.h | 12 ++++++++++-- Source/Engine/Networking/NetworkManager.cpp | 9 ++++----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Source/Engine/Networking/NetworkConfig.h b/Source/Engine/Networking/NetworkConfig.h index 1d47b6fc6..2330847a3 100644 --- a/Source/Engine/Networking/NetworkConfig.h +++ b/Source/Engine/Networking/NetworkConfig.h @@ -22,10 +22,18 @@ public: public: API_FIELD() uint16 ConnectionsLimit = 32; - + + /// + /// Address used to connect to or listen at. + /// Set it to "any" when you want to listen at all available addresses. + /// + /// Only IPv4 is supported. API_FIELD() String Address = String("127.0.0.1"); - + + /// + /// The port to connect to or listen at. + /// API_FIELD() uint16 Port = 7777; diff --git a/Source/Engine/Networking/NetworkManager.cpp b/Source/Engine/Networking/NetworkManager.cpp index 80e49a30c..2088af372 100644 --- a/Source/Engine/Networking/NetworkManager.cpp +++ b/Source/Engine/Networking/NetworkManager.cpp @@ -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(); }