cpp/openttd-patchpack/source Changeset - r25417:d53fed680b16

Changeset - r25417:d53fed680b16

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Patric Stout - 3 years ago 2021-05-08 08:53:21
truebrain@openttd.org

Codechange: move connection_string to private for TCPConnecter

The most common case never needs access to it anymore. Make the
one exception to this explicit. This means the fact that we
store it is now an implementation detail.

2 files changed with 5 insertions and 3 deletions:

src/network/core/tcp.h

src/network/network.cpp

0 comments (0 inline, 0 general)

src/network/core/tcp.h

➞

Show inline comments

@@ @@ -74,6 +74,7 @@ private: @@
 	std::chrono::steady_clock::time_point last_attempt; ///< Time we last tried to connect.
 	std::atomic<bool> is_resolved = false;              ///< Whether resolving is done.
 	std::string connection_string;                      ///< Current address we are connecting to (before resolving).
 	void Resolve();
 	void OnResolved(addrinfo *ai);
@@ @@ -84,8 +85,6 @@ private: @@
 	static void ResolveThunk(TCPConnecter *connecter);
 public:
 	std::string connection_string;                      ///< Current address we are connecting to (before resolving).
 	TCPConnecter(const std::string &connection_string, uint16 default_port);
 	virtual ~TCPConnecter();

src/network/network.cpp

➞

Show inline comments

@@ @@ -1145,8 +1145,11 @@ static void NetworkGenerateServerId() @@
+}
 class TCPNetworkDebugConnecter : TCPConnecter {
 private:
 	std::string connection_string;
 public:
 	TCPNetworkDebugConnecter(const std::string &connection_string) : TCPConnecter(connection_string, NETWORK_DEFAULT_DEBUGLOG_PORT) {}
+	TCPNetworkDebugConnecter(const std::string &connection_string) : TCPConnecter(connection_string, NETWORK_DEFAULT_DEBUGLOG_PORT), connection_string(connection_string) {}
 	void OnFailure() override
+	{

0 comments (0 inline, 0 general)