void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Proactively auto-load designated upstreams.

Browse source
This commit is contained in:
Adam Ierymenko 2016-11-18 10:39:26 -08:00
parent 39333c9e8e
commit 1fcbb1fbed
1 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
node/Topology.cpp
View file

@ -23,6 +23,7 @@
#include "Network.hpp" #include "Network.hpp"
#include "NetworkConfig.hpp" #include "NetworkConfig.hpp"
#include "Buffer.hpp" #include "Buffer.hpp"
#include "Switch.hpp"
namespace ZeroTier { namespace ZeroTier {
@ -180,8 +181,8 @@ SharedPtr<Peer> Topology::getUpstreamPeer(const Address *avoid,unsigned int avoi
} }
} else { } else {
/* If I am not a root server, the best root server is the active one with /* Otherwise pick the best upstream from among roots and any other
* the lowest quality score. (lower == better) */ * designated upstreams that we trust. */
unsigned int bestQualityOverall = ~((unsigned int)0); unsigned int bestQualityOverall = ~((unsigned int)0);
unsigned int bestQualityNotAvoid = ~((unsigned int)0); unsigned int bestQualityNotAvoid = ~((unsigned int)0);
@ -189,8 +190,18 @@ SharedPtr<Peer> Topology::getUpstreamPeer(const Address *avoid,unsigned int avoi
const SharedPtr<Peer> *bestNotAvoid = (const SharedPtr<Peer> *)0; const SharedPtr<Peer> *bestNotAvoid = (const SharedPtr<Peer> *)0;
for(std::vector<Address>::const_iterator a(_upstreamAddresses.begin());a!=_upstreamAddresses.end();++a) { for(std::vector<Address>::const_iterator a(_upstreamAddresses.begin());a!=_upstreamAddresses.end();++a) {
const SharedPtr<Peer> *const p = _peers.get(*a); const SharedPtr<Peer> *p = _peers.get(*a);
if (p) {
if (!p) {
const Identity id(_getIdentity(*a));
if (id) {
p = &(_peers.set(*a,SharedPtr<Peer>(new Peer(RR,RR->identity,id))));
} else {
RR->sw->requestWhois(*a);
}
continue; // always skip since even if we loaded it, it's not going to be ready
}
bool avoiding = false; bool avoiding = false;
for(unsigned int i=0;i<avoidCount;++i) { for(unsigned int i=0;i<avoidCount;++i) {
if (avoid[i] == (*p)->address()) { if (avoid[i] == (*p)->address()) {
@ -208,7 +219,6 @@ SharedPtr<Peer> Topology::getUpstreamPeer(const Address *avoid,unsigned int avoi
bestNotAvoid = &(*p); bestNotAvoid = &(*p);
} }
} }
}
if (bestNotAvoid) { if (bestNotAvoid) {
return *bestNotAvoid; return *bestNotAvoid;
@ -238,8 +248,19 @@ void Topology::setUpstream(const Address &a,bool upstream)
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
if (std::find(_rootAddresses.begin(),_rootAddresses.end(),a) == _rootAddresses.end()) { if (std::find(_rootAddresses.begin(),_rootAddresses.end(),a) == _rootAddresses.end()) {
if (upstream) { if (upstream) {
if (std::find(_upstreamAddresses.begin(),_upstreamAddresses.end(),a) == _upstreamAddresses.end()) if (std::find(_upstreamAddresses.begin(),_upstreamAddresses.end(),a) == _upstreamAddresses.end()) {
_upstreamAddresses.push_back(a); _upstreamAddresses.push_back(a);
const SharedPtr<Peer> *p = _peers.get(a);
if (!p) {
const Identity id(_getIdentity(a));
if (id) {
_peers.set(a,SharedPtr<Peer>(new Peer(RR,RR->identity,id)));
} else {
RR->sw->requestWhois(a);
}
}
}
} else { } else {
std::vector<Address> ua; std::vector<Address> ua;
for(std::vector<Address>::iterator i(_upstreamAddresses.begin());i!=_upstreamAddresses.end();++i) { for(std::vector<Address>::iterator i(_upstreamAddresses.begin());i!=_upstreamAddresses.end();++i) {
@ -326,10 +347,8 @@ void Topology::_setWorld(const World &newWorld)
_amRoot = true; _amRoot = true;
} else { } else {
SharedPtr<Peer> *rp = _peers.get(r->identity.address()); SharedPtr<Peer> *rp = _peers.get(r->identity.address());
if (!rp) { if (!rp)
SharedPtr<Peer> newrp(new Peer(RR,RR->identity,r->identity)); _peers.set(r->identity.address(),SharedPtr<Peer>(new Peer(RR,RR->identity,r->identity)));
_peers.set(r->identity.address(),newrp);
}
} }
} }