diff options
author | Lee *!* Clagett <code@leeclagett.com> | 2021-08-24 19:25:45 -0400 |
---|---|---|
committer | Lee Clagett <code@leeclagett.com> | 2021-09-27 13:47:51 +0000 |
commit | 4d224de6e50c6ad9a64fdc44801d27a156f6cfdd (patch) | |
tree | e46d6a286775aa30223450b6a42c58fd40bad0e7 /src | |
parent | Merge pull request #7964 (diff) | |
download | monero-4d224de6e50c6ad9a64fdc44801d27a156f6cfdd.tar.xz |
Quicker resource cleanup on p2p socks timeout
Diffstat (limited to 'src')
-rw-r--r-- | src/net/socks.h | 7 | ||||
-rw-r--r-- | src/p2p/net_node.cpp | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/net/socks.h b/src/net/socks.h index 739c972ab..506b53195 100644 --- a/src/net/socks.h +++ b/src/net/socks.h @@ -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> diff --git a/src/p2p/net_node.cpp b/src/p2p/net_node.cpp index 8dd551d1e..36977346d 100644 --- a/src/p2p/net_node.cpp +++ b/src/p2p/net_node.cpp @@ -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()); } |