games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +02:00
Code Issues Releases Activity

Use async_resolve to avoid crash on resolve error

Browse Source
This commit is contained in:
Ivan Savenko
2024-05-11 08:46:41 +00:00
parent a74d9791a1
commit 16f43254b5
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/network/NetworkHandler.cpp
View File

@ -32,19 +32,29 @@ std::unique_ptr<INetworkServer> NetworkHandler::createServerTCP(INetworkServerLi
void NetworkHandler::connectToRemote(INetworkClientListener & listener, const std::string & host, uint16_t port) void NetworkHandler::connectToRemote(INetworkClientListener & listener, const std::string & host, uint16_t port)
{ {
auto socket = std::make_shared<NetworkSocket>(*io); auto socket = std::make_shared<NetworkSocket>(*io);
boost::asio::ip::tcp::resolver resolver(*io); auto resolver = std::make_shared<boost::asio::ip::tcp::resolver>(*io);
auto endpoints = resolver.resolve(host, std::to_string(port));
boost::asio::async_connect(*socket, endpoints, [socket, &listener](const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint) resolver->async_resolve(host, std::to_string(port),
[&listener, resolver, socket](const boost::system::error_code& error, const boost::asio::ip::tcp::resolver::results_type & endpoints)
{ {
if (error) if (error)
{ {
listener.onConnectionFailed(error.message()); listener.onConnectionFailed(error.message());
return; return;
} }
auto connection = std::make_shared<NetworkConnection>(listener, socket);
connection->start();
listener.onConnectionEstablished(connection); boost::asio::async_connect(*socket, endpoints, [socket, &listener](const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint)
{
if (error)
{
listener.onConnectionFailed(error.message());
return;
}
auto connection = std::make_shared<NetworkConnection>(listener, socket);
connection->start();
listener.onConnectionEstablished(connection);
});
}); });
} }