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

Now with more worky.

Browse source
This commit is contained in:
Adam Ierymenko 2017-10-25 13:27:28 -07:00
parent 459f1e7bfb
commit 71bdaa9508
4 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ZeroTierOne.h
View file

@ -173,7 +173,7 @@ extern "C" {
/** /**
* Maximum number of direct network paths to a given peer * Maximum number of direct network paths to a given peer
*/ */
#define ZT_MAX_PEER_NETWORK_PATHS 4 #define ZT_MAX_PEER_NETWORK_PATHS 16
/** /**
* Maximum number of path configurations that can be set * Maximum number of path configurations that can be set
@ -1228,9 +1228,9 @@ typedef struct
int versionRev; int versionRev;
/** /**
* Last measured latency in milliseconds or zero if unknown * Last measured latency in milliseconds or -1 if unknown
*/ */
unsigned int latency; int latency;
/** /**
* What trust hierarchy role does this device have? * What trust hierarchy role does this device have?

2
node/Node.cpp
View file

@ -427,6 +427,8 @@ ZT_PeerList *Node::peers() const
p->versionRev = -1; p->versionRev = -1;
} }
p->latency = pi->second->latency(_now); p->latency = pi->second->latency(_now);
if (p->latency >= 0xffff)
p->latency = -1;
p->role = RR->topology->role(pi->second->identity().address()); p->role = RR->topology->role(pi->second->identity().address());
std::vector< SharedPtr<Path> > paths(pi->second->paths(_now)); std::vector< SharedPtr<Path> > paths(pi->second->paths(_now));

48
node/Peer.cpp
View file

@ -153,7 +153,7 @@ void Peer::received(
unsigned int worstQualityPath = 0; unsigned int worstQualityPath = 0;
int worstQuality = 0; int worstQuality = 0;
bool havePath = false; bool havePath = false;
for(unsigned int p=0;p<ZT_PEER_MAX_PATHS;++p) { for(unsigned int p=0;p<ZT_MAX_PEER_NETWORK_PATHS;++p) {
if (_paths[p].p) { if (_paths[p].p) {
if (_paths[p].p == path) { if (_paths[p].p == path) {
_paths[p].lr = now; _paths[p].lr = now;
@ -257,13 +257,13 @@ SharedPtr<Path> Peer::getBestPath(int64_t now,bool includeExpired) const
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
unsigned int bestPath = ZT_PEER_MAX_PATHS; unsigned int bestPath = ZT_MAX_PEER_NETWORK_PATHS;
int bestPathQuality = 2147483647; // INT_MAX int bestPathQuality = 2147483647; // INT_MAX
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i].p) {
if ((includeExpired)||((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)) { if ((includeExpired)||((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)) {
const int q = _paths[i].p->quality(now) / _paths[i].priority; const int q = _paths[i].p->quality(now) / _paths[i].priority;
if (q < bestPathQuality) { if (q <= bestPathQuality) {
bestPathQuality = q; bestPathQuality = q;
bestPath = i; bestPath = i;
} }
@ -271,7 +271,7 @@ SharedPtr<Path> Peer::getBestPath(int64_t now,bool includeExpired) const
} else break; } else break;
} }
if (bestPath != ZT_PEER_MAX_PATHS) if (bestPath != ZT_MAX_PEER_NETWORK_PATHS)
return _paths[bestPath].p; return _paths[bestPath].p;
return SharedPtr<Path>(); return SharedPtr<Path>();
} }
@ -287,31 +287,31 @@ void Peer::introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &o
int theirBestV4QualityByScope[ZT_INETADDRESS_MAX_SCOPE+1]; int theirBestV4QualityByScope[ZT_INETADDRESS_MAX_SCOPE+1];
int theirBestV6QualityByScope[ZT_INETADDRESS_MAX_SCOPE+1]; int theirBestV6QualityByScope[ZT_INETADDRESS_MAX_SCOPE+1];
for(int i=0;i<=ZT_INETADDRESS_MAX_SCOPE;++i) { for(int i=0;i<=ZT_INETADDRESS_MAX_SCOPE;++i) {
myBestV4ByScope[i] = ZT_PEER_MAX_PATHS; myBestV4ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
myBestV6ByScope[i] = ZT_PEER_MAX_PATHS; myBestV6ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
myBestV4QualityByScope[i] = 2147483647; myBestV4QualityByScope[i] = 2147483647;
myBestV6QualityByScope[i] = 2147483647; myBestV6QualityByScope[i] = 2147483647;
theirBestV4ByScope[i] = ZT_PEER_MAX_PATHS; theirBestV4ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
theirBestV6ByScope[i] = ZT_PEER_MAX_PATHS; theirBestV6ByScope[i] = ZT_MAX_PEER_NETWORK_PATHS;
theirBestV4QualityByScope[i] = 2147483647; theirBestV4QualityByScope[i] = 2147483647;
theirBestV6QualityByScope[i] = 2147483647; theirBestV6QualityByScope[i] = 2147483647;
} }
Mutex::Lock _l1(_paths_m); Mutex::Lock _l1(_paths_m);
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i].p) {
const int q = _paths[i].p->quality(now) / _paths[i].priority; const int q = _paths[i].p->quality(now) / _paths[i].priority;
const unsigned int s = (unsigned int)_paths[i].p->ipScope(); const unsigned int s = (unsigned int)_paths[i].p->ipScope();
switch(_paths[i].p->address().ss_family) { switch(_paths[i].p->address().ss_family) {
case AF_INET: case AF_INET:
if (q < myBestV4QualityByScope[s]) { if (q <= myBestV4QualityByScope[s]) {
myBestV4QualityByScope[s] = q; myBestV4QualityByScope[s] = q;
myBestV4ByScope[s] = i; myBestV4ByScope[s] = i;
} }
break; break;
case AF_INET6: case AF_INET6:
if (q < myBestV6QualityByScope[s]) { if (q <= myBestV6QualityByScope[s]) {
myBestV6QualityByScope[s] = q; myBestV6QualityByScope[s] = q;
myBestV6ByScope[s] = i; myBestV6ByScope[s] = i;
} }
@ -322,19 +322,19 @@ void Peer::introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &o
Mutex::Lock _l2(other->_paths_m); Mutex::Lock _l2(other->_paths_m);
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (other->_paths[i].p) { if (other->_paths[i].p) {
const int q = other->_paths[i].p->quality(now) / other->_paths[i].priority; const int q = other->_paths[i].p->quality(now) / other->_paths[i].priority;
const unsigned int s = (unsigned int)other->_paths[i].p->ipScope(); const unsigned int s = (unsigned int)other->_paths[i].p->ipScope();
switch(other->_paths[i].p->address().ss_family) { switch(other->_paths[i].p->address().ss_family) {
case AF_INET: case AF_INET:
if (q < theirBestV4QualityByScope[s]) { if (q <= theirBestV4QualityByScope[s]) {
theirBestV4QualityByScope[s] = q; theirBestV4QualityByScope[s] = q;
theirBestV4ByScope[s] = i; theirBestV4ByScope[s] = i;
} }
break; break;
case AF_INET6: case AF_INET6:
if (q < theirBestV6QualityByScope[s]) { if (q <= theirBestV6QualityByScope[s]) {
theirBestV6QualityByScope[s] = q; theirBestV6QualityByScope[s] = q;
theirBestV6ByScope[s] = i; theirBestV6ByScope[s] = i;
} }
@ -343,23 +343,23 @@ void Peer::introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &o
} else break; } else break;
} }
unsigned int mine = ZT_PEER_MAX_PATHS; unsigned int mine = ZT_MAX_PEER_NETWORK_PATHS;
unsigned int theirs = ZT_PEER_MAX_PATHS; unsigned int theirs = ZT_MAX_PEER_NETWORK_PATHS;
for(int s=ZT_INETADDRESS_MAX_SCOPE;s>=0;--s) { for(int s=ZT_INETADDRESS_MAX_SCOPE;s>=0;--s) {
if ((myBestV6ByScope[s] != ZT_PEER_MAX_PATHS)&&(theirBestV6ByScope[s] != ZT_PEER_MAX_PATHS)) { if ((myBestV6ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS)&&(theirBestV6ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS)) {
mine = myBestV6ByScope[s]; mine = myBestV6ByScope[s];
theirs = theirBestV6ByScope[s]; theirs = theirBestV6ByScope[s];
break; break;
} }
if ((myBestV4ByScope[s] != ZT_PEER_MAX_PATHS)&&(theirBestV4ByScope[s] != ZT_PEER_MAX_PATHS)) { if ((myBestV4ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS)&&(theirBestV4ByScope[s] != ZT_MAX_PEER_NETWORK_PATHS)) {
mine = myBestV4ByScope[s]; mine = myBestV4ByScope[s];
theirs = theirBestV4ByScope[s]; theirs = theirBestV4ByScope[s];
break; break;
} }
} }
if (mine != ZT_PEER_MAX_PATHS) { if (mine != ZT_MAX_PEER_NETWORK_PATHS) {
unsigned int alt = (unsigned int)RR->node->prng() & 1; // randomize which hint we send first for black magickal NAT-t reasons unsigned int alt = (unsigned int)RR->node->prng() & 1; // randomize which hint we send first for black magickal NAT-t reasons
const unsigned int completed = alt + 2; const unsigned int completed = alt + 2;
while (alt != completed) { while (alt != completed) {
@ -472,7 +472,7 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
_lastSentFullHello = now; _lastSentFullHello = now;
unsigned int j = 0; unsigned int j = 0;
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (!_paths[i].p) break; if (!_paths[i].p) break;
if ((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION) { if ((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION) {
if ((sendFullHello)||(_paths[i].p->needsHeartbeat(now))) { if ((sendFullHello)||(_paths[i].p->needsHeartbeat(now))) {
@ -485,7 +485,7 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
++j; ++j;
} }
} }
while(j < ZT_PEER_MAX_PATHS) { while(j < ZT_MAX_PEER_NETWORK_PATHS) {
_paths[j].lr = 0; _paths[j].lr = 0;
_paths[j].p.zero(); _paths[j].p.zero();
_paths[j].priority = 1; _paths[j].priority = 1;
@ -504,7 +504,7 @@ void Peer::clusterRedirect(void *tPtr,const int64_t localSocket,const InetAddres
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
int worstQuality = 0; int worstQuality = 0;
unsigned int worstQualityPath = 0; unsigned int worstQualityPath = 0;
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i].p) {
if (_paths[i].p == np) { // <-- where's my Fields Medal? if (_paths[i].p == np) { // <-- where's my Fields Medal?
_paths[i].lr = now; // consider this a "receive" _paths[i].lr = now; // consider this a "receive"
@ -530,7 +530,7 @@ void Peer::clusterRedirect(void *tPtr,const int64_t localSocket,const InetAddres
void Peer::resetWithinScope(void *tPtr,InetAddress::IpScope scope,int inetAddressFamily,int64_t now) void Peer::resetWithinScope(void *tPtr,InetAddress::IpScope scope,int inetAddressFamily,int64_t now)
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i].p) {
if ((_paths[i].p->address().ss_family == inetAddressFamily)&&(_paths[i].p->ipScope() == scope)) { if ((_paths[i].p->address().ss_family == inetAddressFamily)&&(_paths[i].p->ipScope() == scope)) {
attemptToContactAt(tPtr,_paths[i].p->localSocket(),_paths[i].p->address(),now,false,_paths[i].p->nextOutgoingCounter()); attemptToContactAt(tPtr,_paths[i].p->localSocket(),_paths[i].p->address(),now,false,_paths[i].p->nextOutgoingCounter());

21
node/Peer.hpp
View file

@ -53,15 +53,6 @@
#define ZT_PEER_MAX_SERIALIZED_STATE_SIZE (sizeof(Peer) + 32 + (sizeof(Path) * 2)) #define ZT_PEER_MAX_SERIALIZED_STATE_SIZE (sizeof(Peer) + 32 + (sizeof(Path) * 2))
/**
* Maximum number of direct paths to a peer
*
* This can be increased. You'll want about 2X the number of physical links
* you are ever likely to want to bundle/trunk since there is likely to be
* a path for every protocol (IPv4, IPv6, etc.).
*/
#define ZT_PEER_MAX_PATHS 16
namespace ZeroTier { namespace ZeroTier {
/** /**
@ -134,7 +125,7 @@ public:
inline bool hasActivePathTo(int64_t now,const InetAddress &addr) const inline bool hasActivePathTo(int64_t now,const InetAddress &addr) const
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i].p) {
if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)&&(_paths[i].p->address() == addr)) if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)&&(_paths[i].p->address() == addr))
return true; return true;
@ -257,7 +248,7 @@ public:
{ {
std::vector< SharedPtr<Path> > pp; std::vector< SharedPtr<Path> > pp;
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (!_paths[i].p) break; if (!_paths[i].p) break;
pp.push_back(_paths[i].p); pp.push_back(_paths[i].p);
} }
@ -285,7 +276,9 @@ public:
inline unsigned int latency(const int64_t now) const inline unsigned int latency(const int64_t now) const
{ {
SharedPtr<Path> bp(getBestPath(now,false)); SharedPtr<Path> bp(getBestPath(now,false));
return ((bp) ? bp->latency() : 0xffff); if (bp)
return bp->latency();
return 0xffff;
} }
/** /**
@ -447,7 +440,7 @@ public:
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
unsigned int pc = 0; unsigned int pc = 0;
for(unsigned int i=0;i<ZT_PEER_MAX_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) if (_paths[i].p)
++pc; ++pc;
else break; else break;
@ -531,7 +524,7 @@ private:
uint16_t _vMinor; uint16_t _vMinor;
uint16_t _vRevision; uint16_t _vRevision;
_PeerPath _paths[ZT_PEER_MAX_PATHS]; _PeerPath _paths[ZT_MAX_PEER_NETWORK_PATHS];
Mutex _paths_m; Mutex _paths_m;
Identity _id; Identity _id;