mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-23 21:04:24 +01:00
Code Issues Projects Releases Wiki Activity

epee: close connection when the peer has done so

Browse Source 
This fixes rapid reconnections failing as the peer hasn't yet
worked out the other side is gone, and will reject "duplicate"
connections until a timeout.
This commit is contained in:
moneromooo-monero
2019-11-11 20:05:00 +00:00
parent a48ef0a65a
commit 3d649d528a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/epee/include/net/abstract_tcp_server2.inl
View File

@@ -410,7 +410,12 @@ PRAGMA_WARNING_DISABLE_VS(4355)
else else
{ {
_dbg3("[sock " << socket().native_handle() << "] peer closed connection"); _dbg3("[sock " << socket().native_handle() << "] peer closed connection");
if (m_ready_to_close) bool do_shutdown = false;
CRITICAL_REGION_BEGIN(m_send_que_lock);
if(!m_send_que.size())
do_shutdown = true;
CRITICAL_REGION_END();
if (m_ready_to_close || do_shutdown)
shutdown(); shutdown();
} }
m_ready_to_close = true; m_ready_to_close = true;
@@ -470,6 +475,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
{ {
MERROR("SSL handshake failed"); MERROR("SSL handshake failed");
boost::interprocess::ipcdetail::atomic_write32(&m_want_close_connection, 1); boost::interprocess::ipcdetail::atomic_write32(&m_want_close_connection, 1);
m_ready_to_close = true;
bool do_shutdown = false; bool do_shutdown = false;
CRITICAL_REGION_BEGIN(m_send_que_lock); CRITICAL_REGION_BEGIN(m_send_que_lock);
if(!m_send_que.size()) if(!m_send_que.size())