Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 11:47:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed tunnel build race condition

Browse source
This commit is contained in:
orignal 2014-09-26 10:15:34 -04:00
parent 79d2f69837
commit 9cd62d8873
3 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Tunnel.cpp
View file

@ -246,7 +246,10 @@ namespace tunnel
{
auto it = m_PendingTunnels.find(replyMsgID);
if (it != m_PendingTunnels.end ())
{
it->second->SetState (eTunnelStateBuildReplyReceived);
return it->second;
}
return nullptr;
}
@ -369,23 +372,35 @@ namespace tunnel
void Tunnels::ManageTunnels ()
{
// check pending tunnel. delete non-successive
// check pending tunnel. delete failed or timeout
uint64_t ts = i2p::util::GetSecondsSinceEpoch ();
for (auto it = m_PendingTunnels.begin (); it != m_PendingTunnels.end ();)
{
if (it->second->GetState () == eTunnelStatePending)
auto tunnel = it->second;
switch (tunnel->GetState ())
{
if (ts > it->second->GetCreationTime () + TUNNEL_CREATION_TIMEOUT)
{
LogPrint ("Pending tunnel build request ", it->first, " was not successive. Deleted");
delete it->second;
case eTunnelStatePending:
if (ts > tunnel->GetCreationTime () + TUNNEL_CREATION_TIMEOUT)
{
LogPrint ("Pending tunnel build request ", it->first, " timeout. Deleted");
delete tunnel;
it = m_PendingTunnels.erase (it);
}
else
it++;
break;
case eTunnelStateBuildFailed:
LogPrint ("Pending tunnel build request ", it->first, " failed. Deleted");
delete tunnel;
it = m_PendingTunnels.erase (it);
}
else
break;
case eTunnelStateBuildReplyReceived:
// intermidiate state, will be either established of build failed
it++;
}
else
it = m_PendingTunnels.erase (it);
break;
default:
it = m_PendingTunnels.erase (it);
}
}
ManageInboundTunnels ();
@ -405,7 +420,7 @@ namespace tunnel
if (ts > tunnel->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
{
LogPrint ("Tunnel ", tunnel->GetTunnelID (), " expired");
auto pool = (*it)->GetTunnelPool ();
auto pool = tunnel->GetTunnelPool ();
if (pool)
pool->TunnelExpired (tunnel);
it = m_OutboundTunnels.erase (it);