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

Codechange: track servers with a ServerAddress instead of a NetworkAddress

Browse Source 
This allows future extensions to have different ways of referencing
a server, instead of forcing to use IP:port.
This commit is contained in:
Patric Stout
2021-04-28 14:36:14 +02:00
committed by Patric Stout
parent f4dd2d88c7
commit cee8174d02
6 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/core/tcp_connect.cpp
View File

@@ -33,6 +33,26 @@ TCPConnecter::TCPConnecter(const std::string &connection_string, uint16 default_
_tcp_connecters.push_back(this);
}
/**
* Create a new connecter for the server.
* @param connection_string The address to connect to.
* @param default_port If not indicated in connection_string, what port to use.
*/
TCPServerConnecter::TCPServerConnecter(const std::string &connection_string, uint16 default_port) :
server_address(ServerAddress::Parse(connection_string, default_port))
{
switch (this->server_address.type) {
case SERVER_ADDRESS_DIRECT:
this->connection_string = this->server_address.connection_string;
break;
default:
NOT_REACHED();
}
_tcp_connecters.push_back(this);
}
TCPConnecter::~TCPConnecter()
{
if (this->resolve_thread.joinable()) {