Browse Source

Use async_resolve to avoid crash on resolve error

Ivan Savenko 1 year ago
parent
commit
16f43254b5
1 changed files with 16 additions and 6 deletions
  1. 16 6
      lib/network/NetworkHandler.cpp

+ 16 - 6
lib/network/NetworkHandler.cpp

@@ -32,19 +32,29 @@ std::unique_ptr<INetworkServer> NetworkHandler::createServerTCP(INetworkServerLi
 void NetworkHandler::connectToRemote(INetworkClientListener & listener, const std::string & host, uint16_t port)
 {
 	auto socket = std::make_shared<NetworkSocket>(*io);
-	boost::asio::ip::tcp::resolver 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)
+	auto resolver = std::make_shared<boost::asio::ip::tcp::resolver>(*io);
+
+	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)
 		{
 			listener.onConnectionFailed(error.message());
 			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);
+		});
 	});
 }