diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-09-21 10:11:33 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-09-21 10:11:33 +0200 |
| commit | 07312a7d6e97b792757d324601c95620996715b2 (patch) | |
| tree | 8647526e16c1ae381fbce5bd30e77e373673bbc7 /contrib/epee/include/net/abstract_tcp_server2.h | |
| parent | Merge pull request #2441 (diff) | |
| parent | p2p: add a couple early outs when the stop signal is received (diff) | |
| download | monero-07312a7d6e97b792757d324601c95620996715b2.tar.xz | |
Merge pull request #2302
ef005f5e p2p: add a couple early outs when the stop signal is received (moneromooo-monero)
80d361c7 abstract_tcp_server2: improve tracking/cancelling of early connections (moneromooo-monero)
Diffstat (limited to 'contrib/epee/include/net/abstract_tcp_server2.h')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index ca58d5467..03f143fe4 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -281,8 +281,6 @@ namespace net_utils bool is_thread_worker(); - bool cleanup_connections(); - /// The io_service used to perform asynchronous operations. std::unique_ptr<boost::asio::io_service> m_io_service_local_instance; boost::asio::io_service& io_service_; @@ -309,7 +307,7 @@ namespace net_utils connection_ptr new_connection_; boost::mutex connections_mutex; - std::deque<std::pair<boost::system_time, connection_ptr>> connections_; + std::set<connection_ptr> connections_; }; // class <>boosted_tcp_server |