Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-10 11:28:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

select high bandwidth routers for client tunnels

Browse source
This commit is contained in:
orignal 2014-09-25 21:08:20 -04:00
parent c4ec2ea297
commit 79d2f69837
4 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
NetDb.cpp
View file

@ -785,19 +785,31 @@ namespace data
} }
} }
const RouterInfo * NetDb::GetRandomRouter () const
{
return GetRandomRouter (
[](const RouterInfo * router)->bool
{
return !router->IsHidden ();
});
}
const RouterInfo * NetDb::GetRandomRouter (const RouterInfo * compatibleWith) const const RouterInfo * NetDb::GetRandomRouter (const RouterInfo * compatibleWith) const
{ {
if (compatibleWith)
return GetRandomRouter ( return GetRandomRouter (
[compatibleWith](const RouterInfo * router)->bool [compatibleWith](const RouterInfo * router)->bool
{ {
return !router->IsHidden () && router->IsCompatible (*compatibleWith); return !router->IsHidden () && router->IsCompatible (*compatibleWith);
}); });
else }
return GetRandomRouter (
[](const RouterInfo * router)->bool const RouterInfo * NetDb::GetHighBandwidthRandomRouter (const RouterInfo * compatibleWith) const
{ {
return !router->IsHidden (); return GetRandomRouter (
[compatibleWith](const RouterInfo * router)->bool
{
return !router->IsHidden () && router->IsCompatible (*compatibleWith) &&
(router->GetCaps () & RouterInfo::eHighBandwidth);
}); });
} }

4
NetDb.h
View file

@ -79,7 +79,9 @@ namespace data
void HandleDatabaseSearchReplyMsg (I2NPMessage * msg); void HandleDatabaseSearchReplyMsg (I2NPMessage * msg);
void HandleDatabaseLookupMsg (I2NPMessage * msg); void HandleDatabaseLookupMsg (I2NPMessage * msg);
const RouterInfo * GetRandomRouter (const RouterInfo * compatibleWith = nullptr) const; const RouterInfo * GetRandomRouter () const;
const RouterInfo * GetRandomRouter (const RouterInfo * compatibleWith) const;
const RouterInfo * GetHighBandwidthRandomRouter (const RouterInfo * compatibleWith) const;
void PostI2NPMsg (I2NPMessage * msg); void PostI2NPMsg (I2NPMessage * msg);

13
TunnelPool.cpp
View file

@ -197,6 +197,15 @@ namespace tunnel
i2p::garlic::routing.PostI2NPMsg (msg); i2p::garlic::routing.PostI2NPMsg (msg);
} }
const i2p::data::RouterInfo * TunnelPool::SelectNextHop (const i2p::data::RouterInfo * prevHop) const
{
auto hop = m_NumHops >= 3 ? i2p::data::netdb.GetHighBandwidthRandomRouter (prevHop) :
i2p::data::netdb.GetRandomRouter (prevHop);
if (!hop)
hop = i2p::data::netdb.GetRandomRouter ();
return hop;
}
void TunnelPool::CreateInboundTunnel () void TunnelPool::CreateInboundTunnel ()
{ {
OutboundTunnel * outboundTunnel = GetNextOutboundTunnel (); OutboundTunnel * outboundTunnel = GetNextOutboundTunnel ();
@ -219,7 +228,7 @@ namespace tunnel
} }
for (int i = 0; i < numHops; i++) for (int i = 0; i < numHops; i++)
{ {
auto hop = i2p::data::netdb.GetRandomRouter (prevHop); auto hop = SelectNextHop (prevHop);
prevHop = hop; prevHop = hop;
hops.push_back (hop); hops.push_back (hop);
} }
@ -251,7 +260,7 @@ namespace tunnel
std::vector<const i2p::data::RouterInfo *> hops; std::vector<const i2p::data::RouterInfo *> hops;
for (int i = 0; i < m_NumHops; i++) for (int i = 0; i < m_NumHops; i++)
{ {
auto hop = i2p::data::netdb.GetRandomRouter (prevHop); auto hop = SelectNextHop (prevHop);
prevHop = hop; prevHop = hop;
hops.push_back (hop); hops.push_back (hop);
} }

2
TunnelPool.h
View file

@ -7,6 +7,7 @@
#include <utility> #include <utility>
#include "Identity.h" #include "Identity.h"
#include "LeaseSet.h" #include "LeaseSet.h"
#include "RouterInfo.h"
#include "I2NPProtocol.h" #include "I2NPProtocol.h"
#include "TunnelBase.h" #include "TunnelBase.h"
#include "RouterContext.h" #include "RouterContext.h"
@ -53,6 +54,7 @@ namespace tunnel
template<class TTunnels> template<class TTunnels>
typename TTunnels::value_type GetNextTunnel (TTunnels& tunnels, typename TTunnels::value_type GetNextTunnel (TTunnels& tunnels,
typename TTunnels::value_type suggested = nullptr); typename TTunnels::value_type suggested = nullptr);
const i2p::data::RouterInfo * SelectNextHop (const i2p::data::RouterInfo * prevHop) const;
private: private: