Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2475

Browse Source 
f2939bdc epee: keep a ref to a connection we're deleting (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-02 23:15:56 +04:00
commit c08b6cc485
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/epee/include/net/levin_protocol_handler_async.h
View File

@ -740,9 +740,15 @@ void async_protocol_handler_config<t_connection_context>::del_out_connections(si
shuffle(out_connections.begin(), out_connections.end(), std::default_random_engine(seed)); shuffle(out_connections.begin(), out_connections.end(), std::default_random_engine(seed));
while (count > 0 && out_connections.size() > 0) while (count > 0 && out_connections.size() > 0)
{ {
close(*out_connections.begin()); boost::uuids::uuid connection_id = *out_connections.begin();
del_connection(m_connects.at(*out_connections.begin())); async_protocol_handler<t_connection_context> *connection = find_connection(connection_id);
// we temporarily ref the connection so it doesn't drop from the m_connects table
// when we close it
connection->start_outer_call();
close(connection_id);
del_connection(m_connects.at(connection_id));
out_connections.erase(out_connections.begin()); out_connections.erase(out_connections.begin());
connection->finish_outer_call();
--count; --count;
} }