PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

expiring status for tunnels

Browse Source
This commit is contained in:
orignal 2014-08-26 10:31:32 -04:00
parent 7aacae30eb
commit 72d52d61bc
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tunnel.cpp
View File

@ -256,7 +256,7 @@ namespace tunnel
size_t minReceived = 0; size_t minReceived = 0;
for (auto it : m_InboundTunnels) for (auto it : m_InboundTunnels)
{ {
if (it.second->IsFailed ()) continue; if (!it.second->IsEstablished ()) continue;
if (!tunnel || it.second->GetNumReceivedBytes () < minReceived) if (!tunnel || it.second->GetNumReceivedBytes () < minReceived)
{ {
tunnel = it.second; tunnel = it.second;
@ -274,7 +274,7 @@ namespace tunnel
for (auto it: m_OutboundTunnels) for (auto it: m_OutboundTunnels)
{ {
if (i >= ind) return it; if (i >= ind) return it;
if (!it->IsFailed ()) if (it->IsEstablished ())
{ {
tunnel = it; tunnel = it;
i++; i++;
@ -408,7 +408,11 @@ namespace tunnel
it = m_OutboundTunnels.erase (it); it = m_OutboundTunnels.erase (it);
} }
else else
{
if (ts + TUNNEL_EXPIRATION_THRESHOLD > (*it)->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
(*it)->SetState (eTunnelStateExpiring);
it++; it++;
}
} }
if (m_OutboundTunnels.size () < 5) if (m_OutboundTunnels.size () < 5)
@ -441,7 +445,11 @@ namespace tunnel
it = m_InboundTunnels.erase (it); it = m_InboundTunnels.erase (it);
} }
else else
{
if (ts + TUNNEL_EXPIRATION_THRESHOLD > it->second->GetCreationTime () + TUNNEL_EXPIRATION_TIMEOUT)
it->second->SetState (eTunnelStateExpiring);
it++; it++;
}
} }
if (m_InboundTunnels.empty ()) if (m_InboundTunnels.empty ())

4
Tunnel.h
View File

@ -22,6 +22,7 @@ namespace i2p
namespace tunnel namespace tunnel
{ {
const int TUNNEL_EXPIRATION_TIMEOUT = 660; // 11 minutes const int TUNNEL_EXPIRATION_TIMEOUT = 660; // 11 minutes
const int TUNNEL_EXPIRATION_THRESHOLD = 60; // 1 minute
const int TUNNEL_CREATION_TIMEOUT = 20; // 20 seconds const int TUNNEL_CREATION_TIMEOUT = 20; // 20 seconds
const int STANDARD_NUM_RECORDS = 5; // in VariableTunnelBuild message const int STANDARD_NUM_RECORDS = 5; // in VariableTunnelBuild message
@ -30,7 +31,8 @@ namespace tunnel
eTunnelStatePending, eTunnelStatePending,
eTunnelStateEstablished, eTunnelStateEstablished,
eTunnelStateTestFailed, eTunnelStateTestFailed,
eTunnelStateFailed eTunnelStateFailed,
eTunnelStateExpiring
}; };
class OutboundTunnel; class OutboundTunnel;

1
TunnelPool.h
View File

@ -19,7 +19,6 @@ namespace tunnel
class InboundTunnel; class InboundTunnel;
class OutboundTunnel; class OutboundTunnel;
const int TUNNEL_EXPIRATION_THRESHOLD = 60; // 1 minute
class TunnelPool // per local destination class TunnelPool // per local destination
{ {
public: public: