Browse Source

fixed potential race condition with tunnel tests

pull/2035/head
orignal 10 months ago
parent
commit
3311fe62bb
  1. 9
      libi2pd/TunnelPool.cpp

9
libi2pd/TunnelPool.cpp

@ -102,8 +102,11 @@ namespace tunnel
it->SetTunnelPool (nullptr); it->SetTunnelPool (nullptr);
m_OutboundTunnels.clear (); m_OutboundTunnels.clear ();
} }
{
std::unique_lock<std::mutex> l(m_TestsMutex);
m_Tests.clear (); m_Tests.clear ();
} }
}
bool TunnelPool::Reconfigure(int inHops, int outHops, int inQuant, int outQuant) bool TunnelPool::Reconfigure(int inHops, int outHops, int inQuant, int outQuant)
{ {
@ -145,8 +148,11 @@ namespace tunnel
if (expiredTunnel) if (expiredTunnel)
{ {
expiredTunnel->SetTunnelPool (nullptr); expiredTunnel->SetTunnelPool (nullptr);
{
std::unique_lock<std::mutex> l(m_TestsMutex);
for (auto& it: m_Tests) for (auto& it: m_Tests)
if (it.second.second == expiredTunnel) it.second.second = nullptr; if (it.second.second == expiredTunnel) it.second.second = nullptr;
}
std::unique_lock<std::mutex> l(m_InboundTunnelsMutex); std::unique_lock<std::mutex> l(m_InboundTunnelsMutex);
m_InboundTunnels.erase (expiredTunnel); m_InboundTunnels.erase (expiredTunnel);
@ -167,8 +173,11 @@ namespace tunnel
if (expiredTunnel) if (expiredTunnel)
{ {
expiredTunnel->SetTunnelPool (nullptr); expiredTunnel->SetTunnelPool (nullptr);
{
std::unique_lock<std::mutex> l(m_TestsMutex);
for (auto& it: m_Tests) for (auto& it: m_Tests)
if (it.second.first == expiredTunnel) it.second.first = nullptr; if (it.second.first == expiredTunnel) it.second.first = nullptr;
}
std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex); std::unique_lock<std::mutex> l(m_OutboundTunnelsMutex);
m_OutboundTunnels.erase (expiredTunnel); m_OutboundTunnels.erase (expiredTunnel);

Loading…
Cancel
Save