Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 06:54:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7978

Browse Source 
4d224de Quicker resource cleanup on p2p socks timeout (Lee *!* Clagett)
This commit is contained in:
luigi1111 2021-10-11 13:03:40 -05:00
commit 88b80583b8
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/net/socks.h
View File

@ -201,6 +201,13 @@ namespace socks
std::shared_ptr<client> self_;
void operator()(boost::system::error_code error = boost::system::error_code{});
};
//! Calls `async_close` on `self` at destruction. NOP if `nullptr`.
struct close_on_exit
{
std::shared_ptr<client> self;
~close_on_exit() { async_close{std::move(self)}(); }
};
};
template<typename Handler>

5
src/p2p/net_node.cpp
View File

@ -338,6 +338,7 @@ namespace nodetool
}
};
net::socks::client::close_on_exit close_client{};
boost::unique_future<client_result> socks_result{};
{
boost::promise<client_result> socks_promise{};
@ -346,6 +347,7 @@ namespace nodetool
auto client = net::socks::make_connect_client(
boost::asio::ip::tcp::socket{service}, net::socks::version::v4a, notify{std::move(socks_promise)}
);
close_client.self = client;
if (!start_socks(std::move(client), proxy, remote))
return boost::none;
}
@ -367,7 +369,10 @@ namespace nodetool
{
auto result = socks_result.get();
if (!result.first)
{
close_client.self.reset();
return {std::move(result.second)};
}
MERROR("Failed to make socks connection to " << remote.str() << " (via " << proxy << "): " << result.first.message());
}