e1lama/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-07 06:09:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

mark failed tunnels

Browse Source
This commit is contained in:
orignal
2014-03-21 15:54:55 -04:00
parent ac48e3b355
commit 20369cf6d5
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
TunnelPool.cpp
View File

@@ -31,8 +31,6 @@ namespace tunnel
void TunnelPool::TunnelCreated (InboundTunnel * createdTunnel)
{
m_InboundTunnels.insert (createdTunnel);
if (m_LocalDestination)
m_LocalDestination->UpdateLeaseSet ();
}
void TunnelPool::TunnelExpired (InboundTunnel * expiredTunnel)
@@ -54,10 +52,10 @@ namespace tunnel
void TunnelPool::TunnelExpired (OutboundTunnel * expiredTunnel)
{
if (expiredTunnel)
{
{
expiredTunnel->SetTunnelPool (nullptr);
m_OutboundTunnels.erase (expiredTunnel);
}
}
if (expiredTunnel == m_LastOutboundTunnel)
m_LastOutboundTunnel = nullptr;
}
@@ -69,8 +67,11 @@ namespace tunnel
for (auto it : m_InboundTunnels)
{
if (i >= num) break;
v.push_back (it);
i++;
if (!it->IsFailed ())
{
v.push_back (it);
i++;
}
}
return v;
}
@@ -82,7 +83,7 @@ namespace tunnel
if (m_LastOutboundTunnel && tunnel == m_LastOutboundTunnel)
{
for (auto it: m_OutboundTunnels)
if (it != m_LastOutboundTunnel)
if (it != m_LastOutboundTunnel && !it->IsFailed ())
{
tunnel = it;
break;
@@ -109,8 +110,8 @@ namespace tunnel
{
LogPrint ("Tunnel test ", (int)it.first, " failed");
// both outbound and inbound tunnels considered as invalid
TunnelExpired (it.second.first);
TunnelExpired (it.second.second);
it.second.first->SetFailed (true);
it.second.second->SetFailed (true);
}
m_Tests.clear ();
auto it1 = m_OutboundTunnels.begin ();