From ca6a2970ea83d0850040aa3334e52d83ae0657dc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Apr 2018 16:02:21 -0400 Subject: TraversalClient: Make data externally read-only members private These are only ever queried for state, not written. Therefore, prevent writing to the members and make them private. --- Source/Core/Common/TraversalClient.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'Source/Core/Common/TraversalClient.cpp') diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index 13089b958c..96fe7c75d6 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -32,8 +32,21 @@ TraversalClient::TraversalClient(ENetHost* netHost, const std::string& server, c ReconnectToServer(); } -TraversalClient::~TraversalClient() +TraversalClient::~TraversalClient() = default; + +TraversalHostId TraversalClient::GetHostID() const +{ + return m_HostId; +} + +TraversalClient::State TraversalClient::GetState() const +{ + return m_State; +} + +TraversalClient::FailureReason TraversalClient::GetFailureReason() const { + return m_FailureReason; } void TraversalClient::ReconnectToServer() -- cgit v1.2.3 From 1b8ad49d1e07f7341f55ac0ce657349b303cae7e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Apr 2018 16:24:09 -0400 Subject: TraversalClient: In-class initialize members where applicable --- Source/Core/Common/TraversalClient.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Source/Core/Common/TraversalClient.cpp') diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index 96fe7c75d6..f87fd7e603 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -22,8 +22,7 @@ static void GetRandomishBytes(u8* buf, size_t size) } TraversalClient::TraversalClient(ENetHost* netHost, const std::string& server, const u16 port) - : m_NetHost(netHost), m_Client(nullptr), m_ConnectRequestId(0), m_PendingConnect(false), - m_Server(server), m_port(port), m_PingTime(0) + : m_NetHost(netHost), m_Server(server), m_port(port) { netHost->intercept = TraversalClient::InterceptCallback; -- cgit v1.2.3 From c23a998f9dfde519b5462c50c651a760bfc7ad1c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Apr 2018 16:28:48 -0400 Subject: TraversalClient: Use u32 instead of enet_uint32 Lessens the dependence on the enet library (and we really don't need to rely on a third-party library for a 32-bit integer type) --- Source/Core/Common/TraversalClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/Common/TraversalClient.cpp') diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index f87fd7e603..4c415b2c64 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -243,7 +243,7 @@ void TraversalClient::ResendPacket(OutgoingTraversalPacketInfo* info) void TraversalClient::HandleResends() { - enet_uint32 now = enet_time_get(); + const u32 now = enet_time_get(); for (auto& tpi : m_OutgoingTraversalPackets) { if (now - tpi.sendTime >= (u32)(300 * tpi.tries)) @@ -265,7 +265,7 @@ void TraversalClient::HandleResends() void TraversalClient::HandlePing() { - enet_uint32 now = enet_time_get(); + const u32 now = enet_time_get(); if (m_State == Connected && now - m_PingTime >= 500) { TraversalPacket ping = {}; -- cgit v1.2.3