diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-22 14:42:34 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-22 14:42:37 +0200 |
| commit | e6dbea094c79058a3272b5d713b69095eb15aac7 (patch) | |
| tree | bd220d60d507b28e54f217f2eb950520f70220b9 /contrib/epee/include/net/abstract_tcp_server2.h | |
| parent | Merge pull request #552 (diff) | |
| parent | epee: fix hang on exit (diff) | |
| download | monero-e6dbea094c79058a3272b5d713b69095eb15aac7.tar.xz | |
Merge pull request #553
1e2f2d7 epee: fix hang on exit (moneromooo-monero)
17ff6f2 net_node: fix a hang on exit (moneromooo-monero)
Diffstat (limited to 'contrib/epee/include/net/abstract_tcp_server2.h')
| -rw-r--r-- | contrib/epee/include/net/abstract_tcp_server2.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h index 8043c0876..77396ade4 100644 --- a/contrib/epee/include/net/abstract_tcp_server2.h +++ b/contrib/epee/include/net/abstract_tcp_server2.h @@ -110,6 +110,8 @@ namespace net_utils bool speed_limit_is_enabled() const; ///< tells us should we be sleeping here (e.g. do not sleep on RPC connections) + + bool cancel(); private: //----------------- i_service_endpoint --------------------- @@ -303,6 +305,9 @@ namespace net_utils /// The next connection to be accepted connection_ptr new_connection_; + std::mutex connections_mutex; + std::deque<connection_ptr> connections_; + }; // class <>boosted_tcp_server |