dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/network/core/tcp_connect.cpp
This commit is contained in:
Jonathan G Rennison
2021-12-06 19:33:36 +00:00
parent 4543803823 ad89601c49
commit 0b45103eed
10 changed files with 70 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/core/tcp.h
View File

@@ -91,15 +91,15 @@ private:
* lock on the game-state.
*/
enum class Status {
INIT, ///< TCPConnecter is created but resolving hasn't started.
RESOLVING, ///< The hostname is being resolved (threaded).
FAILURE, ///< Resolving failed.
CONNECTING, ///< We are currently connecting.
CONNECTED, ///< The connection is established.
Init, ///< TCPConnecter is created but resolving hasn't started.
Resolving, ///< The hostname is being resolved (threaded).
Failure, ///< Resolving failed.
Connecting, ///< We are currently connecting.
Connected, ///< The connection is established.
};
std::thread resolve_thread; ///< Thread used during resolving.
std::atomic<Status> status = Status::INIT; ///< The current status of the connecter.
std::atomic<Status> status = Status::Init; ///< The current status of the connecter.
std::atomic<bool> killed = false; ///< Whether this connecter is marked as killed.
addrinfo *ai = nullptr; ///< getaddrinfo() allocated linked-list of resolved addresses.