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

Call it _relays since there might be other kinds later.

Browse source
This commit is contained in:
Adam Ierymenko 2015-06-01 17:09:37 -07:00
parent 5bc89034bc
commit 318c2f025b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
node/Node.cpp
View file

@ -189,16 +189,16 @@ public:
RR(renv), RR(renv),
_now(now), _now(now),
_supernodes(RR->topology->supernodeAddresses()), _supernodes(RR->topology->supernodeAddresses()),
_networkRelays() _relays()
{ {
std::vector< SharedPtr<Network> > nws(renv->node->allNetworks()); std::vector< SharedPtr<Network> > nws(renv->node->allNetworks());
for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) { for(std::vector< SharedPtr<Network> >::const_iterator nw(nws.begin());nw!=nws.end();++nw) {
SharedPtr<NetworkConfig> nc((*nw)->config2()); SharedPtr<NetworkConfig> nc((*nw)->config2());
if (nc) if (nc)
_networkRelays.insert(_networkRelays.end(),nc->relays().begin(),nc->relays().end()); _relays.insert(_relays.end(),nc->relays().begin(),nc->relays().end());
} }
std::sort(_networkRelays.begin(),_networkRelays.end()); std::sort(_relays.begin(),_relays.end());
std::unique(_networkRelays.begin(),_networkRelays.end()); std::unique(_relays.begin(),_relays.end());
} }
uint64_t lastReceiveFromUpstream; uint64_t lastReceiveFromUpstream;
@ -222,7 +222,7 @@ public:
if (!ison) { if (!ison) {
// Note that multiple networks might designate the same peer as // Note that multiple networks might designate the same peer as
// a preferred relay, so try all suggested endpoints. // a preferred relay, so try all suggested endpoints.
for(std::vector< std::pair<Address,InetAddress> >::const_iterator r(_networkRelays.begin());r!=_networkRelays.end();++r) { for(std::vector< std::pair<Address,InetAddress> >::const_iterator r(_relays.begin());r!=_relays.end();++r) {
if (r->first == p->address()) if (r->first == p->address())
p->attemptToContactAt(RR,r->second,_now); p->attemptToContactAt(RR,r->second,_now);
} }
@ -234,7 +234,7 @@ private:
const RuntimeEnvironment *RR; const RuntimeEnvironment *RR;
uint64_t _now; uint64_t _now;
std::vector<Address> _supernodes; std::vector<Address> _supernodes;
std::vector< std::pair<Address,InetAddress> > _networkRelays; std::vector< std::pair<Address,InetAddress> > _relays;
}; };
ZT1_ResultCode Node::processBackgroundTasks(uint64_t now,volatile uint64_t *nextBackgroundTaskDeadline) ZT1_ResultCode Node::processBackgroundTasks(uint64_t now,volatile uint64_t *nextBackgroundTaskDeadline)