From ca6a2970ea83d0850040aa3334e52d83ae0657dc Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
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 ++++++++++++++-
 Source/Core/Common/TraversalClient.h   | 14 ++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

(limited to 'Source/Core/Common')

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()
diff --git a/Source/Core/Common/TraversalClient.h b/Source/Core/Common/TraversalClient.h
index e85453e0e9..ce6a78e768 100644
--- a/Source/Core/Common/TraversalClient.h
+++ b/Source/Core/Common/TraversalClient.h
@@ -41,6 +41,11 @@ public:
   };
   TraversalClient(ENetHost* netHost, const std::string& server, const u16 port);
   ~TraversalClient();
+
+  TraversalHostId GetHostID() const;
+  State GetState() const;
+  FailureReason GetFailureReason() const;
+
   void Reset();
   void ConnectToClient(const std::string& host);
   void ReconnectToServer();
@@ -49,11 +54,7 @@ public:
   bool TestPacket(u8* data, size_t size, ENetAddress* from);
   void HandleResends();
 
-  ENetHost* m_NetHost;
   TraversalClientClient* m_Client;
-  TraversalHostId m_HostId;
-  State m_State;
-  FailureReason m_FailureReason;
 
 private:
   struct OutgoingTraversalPacketInfo
@@ -68,6 +69,11 @@ private:
   void OnFailure(FailureReason reason);
   void HandlePing();
   static int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
+
+  ENetHost* m_NetHost;
+  TraversalHostId m_HostId;
+  State m_State;
+  FailureReason m_FailureReason;
   TraversalRequestId m_ConnectRequestId;
   bool m_PendingConnect;
   std::list<OutgoingTraversalPacketInfo> m_OutgoingTraversalPackets;
-- 
cgit v1.2.3