ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-26 16:11:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Yet more cleanup, it builds again now.

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-21 14:36:56 -07:00
parent 0b5472f9fb
commit 95a6fce2b4
No known key found for this signature in database
GPG Key ID: 1657198823E52A61
8 changed files with 92 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/EmbeddedNetworkController.cpp
View File

@ -1151,7 +1151,7 @@ void EmbeddedNetworkController::onNetworkMemberUpdate(const void *db,uint64_t ne
void EmbeddedNetworkController::onNetworkMemberDeauthorize(const void *db,uint64_t networkId,uint64_t memberId) void EmbeddedNetworkController::onNetworkMemberDeauthorize(const void *db,uint64_t networkId,uint64_t memberId)
{ {
const int64_t now = OSUtils::now(); const int64_t now = OSUtils::now();
Revocation rev((uint32_t)_node->prng(),networkId,0,now,ZT_REVOCATION_FLAG_FAST_PROPAGATE,Address(memberId),Revocation::CREDENTIAL_TYPE_COM); Revocation rev((uint32_t)Utils::random(),networkId,0,now,ZT_REVOCATION_FLAG_FAST_PROPAGATE,Address(memberId),Revocation::CREDENTIAL_TYPE_COM);
rev.sign(_signingId); rev.sign(_signingId);
{ {
std::lock_guard<std::mutex> l(_memberStatus_l); std::lock_guard<std::mutex> l(_memberStatus_l);

5
node/Constants.hpp
View File

@ -461,11 +461,6 @@
*/ */
#define ZT_PEER_PING_PERIOD 45000 #define ZT_PEER_PING_PERIOD 45000
/**
* Paths are considered expired if they have not sent us a real packet in this long
*/
#define ZT_PEER_PATH_EXPIRATION ((ZT_PEER_PING_PERIOD * 4) + 3000)
/** /**
* How often to retry expired paths that we're still remembering * How often to retry expired paths that we're still remembering
*/ */

2
node/IncomingPacket.cpp
View File

@ -999,7 +999,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,void *tPt
unsigned int ptr = ZT_PACKET_IDX_PAYLOAD + 2; unsigned int ptr = ZT_PACKET_IDX_PAYLOAD + 2;
while (count--) { // if ptr overflows Buffer will throw while (count--) { // if ptr overflows Buffer will throw
unsigned int flags = (*this)[ptr++]; /* unsigned int flags = (*this)[ptr++]; */ ++ptr;
unsigned int extLen = at<uint16_t>(ptr); ptr += 2; unsigned int extLen = at<uint16_t>(ptr); ptr += 2;
ptr += extLen; // unused right now ptr += extLen; // unused right now
unsigned int addrType = (*this)[ptr++]; unsigned int addrType = (*this)[ptr++];

2
node/Node.cpp
View File

@ -424,7 +424,7 @@ void Node::status(ZT_NodeStatus *status) const
status->online = _online ? 1 : 0; status->online = _online ? 1 : 0;
} }
struct _sortPeerPtrsByAddress { inline bool cmp(const SharedPtr<Peer> &a,const SharedPtr<Peer> &b) const { return (a->address() < b->address()); } }; struct _sortPeerPtrsByAddress { inline bool operator()(const SharedPtr<Peer> &a,const SharedPtr<Peer> &b) const { return (a->address() < b->address()); } };
ZT_PeerList *Node::peers() const ZT_PeerList *Node::peers() const
{ {

162
node/Peer.cpp
View File

@ -38,8 +38,6 @@
namespace ZeroTier { namespace ZeroTier {
static unsigned char s_freeRandomByteCounter = 0;
Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity) : Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity) :
RR(renv), RR(renv),
_lastReceive(0), _lastReceive(0),
@ -52,11 +50,11 @@ Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Ident
_lastACKWindowReset(0), _lastACKWindowReset(0),
_lastQoSWindowReset(0), _lastQoSWindowReset(0),
_lastMultipathCompatibilityCheck(0), _lastMultipathCompatibilityCheck(0),
_freeRandomByte((unsigned char)((uintptr_t)this >> 4) ^ ++s_freeRandomByteCounter),
_uniqueAlivePathCount(0), _uniqueAlivePathCount(0),
_localMultipathSupported(false), _localMultipathSupported(false),
_remoteMultipathSupported(false), _remoteMultipathSupported(false),
_canUseMultipath(false), _canUseMultipath(false),
_freeRandomByte((uint8_t)Utils::random()),
_vProto(0), _vProto(0),
_vMajor(0), _vMajor(0),
_vMinor(0), _vMinor(0),
@ -99,8 +97,8 @@ void Peer::received(
sendQOS_MEASUREMENT(tPtr, path, path->localSocket(), path->address(), now); sendQOS_MEASUREMENT(tPtr, path, path->localSocket(), path->address(), now);
} }
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
_paths[i].p->processBackgroundPathMeasurements(now); _paths[i]->processBackgroundPathMeasurements(now);
} }
} }
} }
@ -112,9 +110,8 @@ void Peer::received(
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if (_paths[i].p == path) { if (_paths[i] == path) {
_paths[i].lr = now;
havePath = true; havePath = true;
break; break;
} }
@ -131,13 +128,13 @@ void Peer::received(
bool redundant = false; bool redundant = false;
unsigned int replacePath = ZT_MAX_PEER_NETWORK_PATHS; unsigned int replacePath = ZT_MAX_PEER_NETWORK_PATHS;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if ( (_paths[i].p->alive(now)) && ( ((_paths[i].p->localSocket() == path->localSocket())&&(_paths[i].p->address().ss_family == path->address().ss_family)) || (_paths[i].p->address().ipsEqual2(path->address())) ) ) { if ( (_paths[i]->alive(now)) && ( ((_paths[i]->localSocket() == path->localSocket())&&(_paths[i]->address().ss_family == path->address().ss_family)) || (_paths[i]->address().ipsEqual2(path->address())) ) ) {
redundant = true; redundant = true;
break; break;
} }
// If the path is the same address and port, simply assume this is a replacement // If the path is the same address and port, simply assume this is a replacement
if ( (_paths[i].p->address().ipsEqual2(path->address()))) { if ( (_paths[i]->address().ipsEqual2(path->address()))) {
replacePath = i; replacePath = i;
break; break;
} }
@ -149,8 +146,8 @@ void Peer::received(
if (!redundant && replacePath == ZT_MAX_PEER_NETWORK_PATHS) { if (!redundant && replacePath == ZT_MAX_PEER_NETWORK_PATHS) {
int replacePathQuality = 0; int replacePathQuality = 0;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
const int q = _paths[i].p->quality(now); const int q = _paths[i]->quality(now);
if (q > replacePathQuality) { if (q > replacePathQuality) {
replacePathQuality = q; replacePathQuality = q;
replacePath = i; replacePath = i;
@ -165,8 +162,7 @@ void Peer::received(
if (replacePath != ZT_MAX_PEER_NETWORK_PATHS) { if (replacePath != ZT_MAX_PEER_NETWORK_PATHS) {
if (verb == Packet::VERB_OK) { if (verb == Packet::VERB_OK) {
RR->t->peerLearnedNewPath(tPtr,networkId,*this,path,packetId); RR->t->peerLearnedNewPath(tPtr,networkId,*this,path,packetId);
_paths[replacePath].lr = now; _paths[replacePath] = path;
_paths[replacePath].p = path;
} else { } else {
attemptToContact = true; attemptToContact = true;
} }
@ -259,22 +255,22 @@ void Peer::computeAggregateProportionalAllocation(int64_t now)
memset(&relThroughput, 0, sizeof(relThroughput)); memset(&relThroughput, 0, sizeof(relThroughput));
// Survey all paths // Survey all paths
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
relStability[i] = _paths[i].p->lastComputedStability(); relStability[i] = _paths[i]->lastComputedStability();
relThroughput[i] = (float)_paths[i].p->maxLifetimeThroughput(); relThroughput[i] = (float)_paths[i]->maxLifetimeThroughput();
maxStability = relStability[i] > maxStability ? relStability[i] : maxStability; maxStability = relStability[i] > maxStability ? relStability[i] : maxStability;
maxThroughput = relThroughput[i] > maxThroughput ? relThroughput[i] : maxThroughput; maxThroughput = relThroughput[i] > maxThroughput ? relThroughput[i] : maxThroughput;
maxScope = _paths[i].p->ipScope() > maxScope ? _paths[i].p->ipScope() : maxScope; maxScope = _paths[i]->ipScope() > maxScope ? _paths[i]->ipScope() : maxScope;
} }
} }
// Convert to relative values // Convert to relative values
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
relStability[i] /= maxStability ? maxStability : 1; relStability[i] /= maxStability ? maxStability : 1;
relThroughput[i] /= maxThroughput ? maxThroughput : 1; relThroughput[i] /= maxThroughput ? maxThroughput : 1;
float normalized_ma = Utils::normalize((float)_paths[i].p->ackAge(now), 0, ZT_PATH_MAX_AGE, 0, 10); float normalized_ma = Utils::normalize((float)_paths[i]->ackAge(now), 0, ZT_PATH_MAX_AGE, 0, 10);
float age_contrib = exp((-1)*normalized_ma); float age_contrib = exp((-1)*normalized_ma);
float relScope = ((float)(_paths[i].p->ipScope()+1) / (maxScope + 1)); float relScope = ((float)(_paths[i]->ipScope()+1) / (maxScope + 1));
float relQuality = float relQuality =
(relStability[i] * (float)ZT_PATH_CONTRIB_STABILITY) (relStability[i] * (float)ZT_PATH_CONTRIB_STABILITY)
+ (fmaxf(1.0f, relThroughput[i]) * (float)ZT_PATH_CONTRIB_THROUGHPUT) + (fmaxf(1.0f, relThroughput[i]) * (float)ZT_PATH_CONTRIB_THROUGHPUT)
@ -284,13 +280,13 @@ void Peer::computeAggregateProportionalAllocation(int64_t now)
relQuality = relQuality > (1.00f / 100.0f) ? relQuality : 0.0f; relQuality = relQuality > (1.00f / 100.0f) ? relQuality : 0.0f;
relQuality = relQuality < (99.0f / 100.0f) ? relQuality : 1.0f; relQuality = relQuality < (99.0f / 100.0f) ? relQuality : 1.0f;
totalRelativeQuality += relQuality; totalRelativeQuality += relQuality;
_paths[i].p->updateRelativeQuality(relQuality); _paths[i]->updateRelativeQuality(relQuality);
} }
} }
// Convert set of relative performances into an allocation set // Convert set of relative performances into an allocation set
for(uint16_t i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(uint16_t i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
_paths[i].p->updateComponentAllocationOfAggregateLink((unsigned char)((_paths[i].p->relativeQuality() / totalRelativeQuality) * 255)); _paths[i]->updateComponentAllocationOfAggregateLink((unsigned char)((_paths[i]->relativeQuality() / totalRelativeQuality) * 255));
} }
} }
} }
@ -299,8 +295,8 @@ int Peer::computeAggregateLinkPacketDelayVariance()
{ {
float pdv = 0.0; float pdv = 0.0;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
pdv += _paths[i].p->relativeQuality() * _paths[i].p->packetDelayVariance(); pdv += _paths[i]->relativeQuality() * _paths[i]->packetDelayVariance();
} }
} }
return (int)pdv; return (int)pdv;
@ -311,9 +307,9 @@ int Peer::computeAggregateLinkMeanLatency()
int ml = 0; int ml = 0;
int pathCount = 0; int pathCount = 0;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
pathCount++; pathCount++;
ml += (int)(_paths[i].p->relativeQuality() * _paths[i].p->meanLatency()); ml += (int)(_paths[i]->relativeQuality() * _paths[i]->meanLatency());
} }
} }
return ml / pathCount; return ml / pathCount;
@ -325,9 +321,9 @@ int Peer::aggregateLinkPhysicalPathCount()
int pathCount = 0; int pathCount = 0;
int64_t now = RR->node->now(); int64_t now = RR->node->now();
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p && _paths[i].p->alive(now)) { if (_paths[i] && _paths[i]->alive(now)) {
if (!ifnamemap[_paths[i].p->getName()]) { if (!ifnamemap[_paths[i]->getName()]) {
ifnamemap[_paths[i].p->getName()] = true; ifnamemap[_paths[i]->getName()] = true;
pathCount++; pathCount++;
} }
} }
@ -340,7 +336,7 @@ int Peer::aggregateLinkLogicalPathCount()
int pathCount = 0; int pathCount = 0;
int64_t now = RR->node->now(); int64_t now = RR->node->now();
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p && _paths[i].p->alive(now)) { if (_paths[i] && _paths[i]->alive(now)) {
pathCount++; pathCount++;
} }
} }
@ -359,9 +355,9 @@ SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired)
if (!_canUseMultipath) { if (!_canUseMultipath) {
long bestPathQuality = 2147483647; long bestPathQuality = 2147483647;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if ((includeExpired)||((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)) { if ((includeExpired)||(_paths[i]->alive(now))) {
const long q = _paths[i].p->quality(now); const long q = _paths[i]->quality(now);
if (q <= bestPathQuality) { if (q <= bestPathQuality) {
bestPathQuality = q; bestPathQuality = q;
bestPath = i; bestPath = i;
@ -370,14 +366,14 @@ SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired)
} else break; } else break;
} }
if (bestPath != ZT_MAX_PEER_NETWORK_PATHS) { if (bestPath != ZT_MAX_PEER_NETWORK_PATHS) {
return _paths[bestPath].p; return _paths[bestPath];
} }
return SharedPtr<Path>(); return SharedPtr<Path>();
} }
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
_paths[i].p->processBackgroundPathMeasurements(now); _paths[i]->processBackgroundPathMeasurements(now);
} }
} }
@ -392,8 +388,8 @@ SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired)
memset(&alivePaths, -1, sizeof(alivePaths)); memset(&alivePaths, -1, sizeof(alivePaths));
memset(&stalePaths, -1, sizeof(stalePaths)); memset(&stalePaths, -1, sizeof(stalePaths));
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if (_paths[i].p->alive(now)) { if (_paths[i]->alive(now)) {
alivePaths[numAlivePaths] = i; alivePaths[numAlivePaths] = i;
numAlivePaths++; numAlivePaths++;
} }
@ -406,12 +402,12 @@ SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired)
unsigned int r = _freeRandomByte; unsigned int r = _freeRandomByte;
if (numAlivePaths > 0) { if (numAlivePaths > 0) {
int rf = r % numAlivePaths; int rf = r % numAlivePaths;
return _paths[alivePaths[rf]].p; return _paths[alivePaths[rf]];
} }
else if(numStalePaths > 0) { else if(numStalePaths > 0) {
// Resort to trying any non-expired path // Resort to trying any non-expired path
int rf = r % numStalePaths; int rf = r % numStalePaths;
return _paths[stalePaths[rf]].p; return _paths[stalePaths[rf]];
} }
} }
@ -426,17 +422,17 @@ SharedPtr<Path> Peer::getAppropriatePath(int64_t now, bool includeExpired)
// Randomly choose path according to their allocations // Randomly choose path according to their allocations
float rf = _freeRandomByte; float rf = _freeRandomByte;
for(int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if (rf < _paths[i].p->allocation()) { if (rf < _paths[i]->allocation()) {
bestPath = i; bestPath = i;
_pathChoiceHist.push(bestPath); // Record which path we chose _pathChoiceHist.push(bestPath); // Record which path we chose
break; break;
} }
rf -= _paths[i].p->allocation(); rf -= _paths[i]->allocation();
} }
} }
if (bestPath < ZT_MAX_PEER_NETWORK_PATHS) { if (bestPath < ZT_MAX_PEER_NETWORK_PATHS) {
return _paths[bestPath].p; return _paths[bestPath];
} }
} }
return SharedPtr<Path>(); return SharedPtr<Path>();
@ -452,8 +448,8 @@ char *Peer::interfaceListStr()
memset(_interfaceListStr, 0, sizeof(_interfaceListStr)); memset(_interfaceListStr, 0, sizeof(_interfaceListStr));
int alivePathCount = aggregateLinkLogicalPathCount(); int alivePathCount = aggregateLinkLogicalPathCount();
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p && _paths[i].p->alive(now)) { if (_paths[i] && _paths[i]->alive(now)) {
int ipv = _paths[i].p->address().isV4(); int ipv = _paths[i]->address().isV4();
// If this is acting as an aggregate link, check allocations // If this is acting as an aggregate link, check allocations
float targetAllocation = 1.0f / (float)alivePathCount; float targetAllocation = 1.0f / (float)alivePathCount;
float currentAllocation = 1.0f; float currentAllocation = 1.0f;
@ -464,14 +460,14 @@ char *Peer::interfaceListStr()
} }
} }
char *ipvStr = ipv ? (char*)"ipv4" : (char*)"ipv6"; char *ipvStr = ipv ? (char*)"ipv4" : (char*)"ipv6";
sprintf(tmp, "(%s, %s, %.3f)", _paths[i].p->getName(), ipvStr, currentAllocation); sprintf(tmp, "(%s, %s, %.3f)", _paths[i]->getName(), ipvStr, currentAllocation);
// Prevent duplicates // Prevent duplicates
if(ifnamemap[_paths[i].p->getName()] != ipv) { if(ifnamemap[_paths[i]->getName()] != ipv) {
memcpy(ptr, tmp, strlen(tmp)); memcpy(ptr, tmp, strlen(tmp));
ptr += strlen(tmp); ptr += strlen(tmp);
*ptr = ' '; *ptr = ' ';
ptr++; ptr++;
ifnamemap[_paths[i].p->getName()] = ipv; ifnamemap[_paths[i]->getName()] = ipv;
} }
} }
} }
@ -509,10 +505,10 @@ void Peer::introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &o
Mutex::Lock _l1(_paths_m); Mutex::Lock _l1(_paths_m);
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
const long q = _paths[i].p->quality(now); const long q = _paths[i]->quality(now);
const unsigned int s = (unsigned int)_paths[i].p->ipScope(); const unsigned int s = (unsigned int)_paths[i]->ipScope();
switch(_paths[i].p->address().ss_family) { switch(_paths[i]->address().ss_family) {
case AF_INET: case AF_INET:
if (q <= myBestV4QualityByScope[s]) { if (q <= myBestV4QualityByScope[s]) {
myBestV4QualityByScope[s] = q; myBestV4QualityByScope[s] = q;
@ -532,10 +528,10 @@ 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_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (other->_paths[i].p) { if (other->_paths[i]) {
const long q = other->_paths[i].p->quality(now); const long q = other->_paths[i]->quality(now);
const unsigned int s = (unsigned int)other->_paths[i].p->ipScope(); const unsigned int s = (unsigned int)other->_paths[i]->ipScope();
switch(other->_paths[i].p->address().ss_family) { switch(other->_paths[i]->address().ss_family) {
case AF_INET: case AF_INET:
if (q <= theirBestV4QualityByScope[s]) { if (q <= theirBestV4QualityByScope[s]) {
theirBestV4QualityByScope[s] = q; theirBestV4QualityByScope[s] = q;
@ -576,30 +572,30 @@ void Peer::introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &o
Packet outp(_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS); Packet outp(_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS);
outp.append((uint8_t)0); outp.append((uint8_t)0);
other->_id.address().appendTo(outp); other->_id.address().appendTo(outp);
outp.append((uint16_t)other->_paths[theirs].p->address().port()); outp.append((uint16_t)other->_paths[theirs]->address().port());
if (other->_paths[theirs].p->address().ss_family == AF_INET6) { if (other->_paths[theirs]->address().ss_family == AF_INET6) {
outp.append((uint8_t)16); outp.append((uint8_t)16);
outp.append(other->_paths[theirs].p->address().rawIpData(),16); outp.append(other->_paths[theirs]->address().rawIpData(),16);
} else { } else {
outp.append((uint8_t)4); outp.append((uint8_t)4);
outp.append(other->_paths[theirs].p->address().rawIpData(),4); outp.append(other->_paths[theirs]->address().rawIpData(),4);
} }
outp.armor(_key,true); outp.armor(_key,true);
_paths[mine].p->send(RR,tPtr,outp.data(),outp.size(),now); _paths[mine]->send(RR,tPtr,outp.data(),outp.size(),now);
} else { } else {
Packet outp(other->_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS); Packet outp(other->_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS);
outp.append((uint8_t)0); outp.append((uint8_t)0);
_id.address().appendTo(outp); _id.address().appendTo(outp);
outp.append((uint16_t)_paths[mine].p->address().port()); outp.append((uint16_t)_paths[mine]->address().port());
if (_paths[mine].p->address().ss_family == AF_INET6) { if (_paths[mine]->address().ss_family == AF_INET6) {
outp.append((uint8_t)16); outp.append((uint8_t)16);
outp.append(_paths[mine].p->address().rawIpData(),16); outp.append(_paths[mine]->address().rawIpData(),16);
} else { } else {
outp.append((uint8_t)4); outp.append((uint8_t)4);
outp.append(_paths[mine].p->address().rawIpData(),4); outp.append(_paths[mine]->address().rawIpData(),4);
} }
outp.armor(other->_key,true); outp.armor(other->_key,true);
other->_paths[theirs].p->send(RR,tPtr,outp.data(),outp.size(),now); other->_paths[theirs]->send(RR,tPtr,outp.data(),outp.size(),now);
} }
++alt; ++alt;
} }
@ -624,10 +620,10 @@ inline void Peer::processBackgroundPeerTasks(const int64_t now)
int currAlivePathCount = 0; int currAlivePathCount = 0;
int duplicatePathsFound = 0; int duplicatePathsFound = 0;
for (unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for (unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
currAlivePathCount++; currAlivePathCount++;
for (unsigned int j=0;j<ZT_MAX_PEER_NETWORK_PATHS;++j) { for (unsigned int j=0;j<ZT_MAX_PEER_NETWORK_PATHS;++j) {
if (_paths[i].p && _paths[j].p && _paths[i].p->address().ipsEqual2(_paths[j].p->address()) && i != j) { if (_paths[i] && _paths[j] && _paths[i]->address().ipsEqual2(_paths[j]->address()) && i != j) {
duplicatePathsFound+=1; duplicatePathsFound+=1;
break; break;
} }
@ -721,13 +717,13 @@ void Peer::ping(void *tPtr,int64_t now,unsigned int &v4SendCount,unsigned int &v
unsigned int j = 0; unsigned int j = 0;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if ((_paths[i].p)&&(_paths[i].p->alive(now))) { if ((_paths[i])&&(_paths[i]->alive(now))) {
sendHELLO(tPtr,_paths[i].p->localSocket(),_paths[i].p->address(),now); sendHELLO(tPtr,_paths[i]->localSocket(),_paths[i]->address(),now);
_paths[i].p->sent(now); _paths[i]->sent(now);
if (_paths[i].p->address().isV4()) if (_paths[i]->address().isV4())
++v4SendCount; ++v4SendCount;
else if (_paths[i].p->address().isV6()) else if (_paths[i]->address().isV6())
++v6SendCount; ++v6SendCount;
if (i != j) if (i != j)
@ -736,8 +732,7 @@ void Peer::ping(void *tPtr,int64_t now,unsigned int &v4SendCount,unsigned int &v
} }
} }
while(j < ZT_MAX_PEER_NETWORK_PATHS) { while(j < ZT_MAX_PEER_NETWORK_PATHS) {
_paths[j].lr = 0; _paths[j].zero();
_paths[j].p.zero();
++j; ++j;
} }
} }
@ -746,11 +741,10 @@ void Peer::resetWithinScope(void *tPtr,InetAddress::IpScope scope,int inetAddres
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if ((_paths[i].p->address().ss_family == inetAddressFamily)&&(_paths[i].p->ipScope() == scope)) { if ((_paths[i]->address().ss_family == inetAddressFamily)&&(_paths[i]->ipScope() == scope)) {
sendHELLO(tPtr,_paths[i].p->localSocket(),_paths[i].p->address(),now); sendHELLO(tPtr,_paths[i]->localSocket(),_paths[i]->address(),now);
_paths[i].p->sent(now); _paths[i]->sent(now);
_paths[i].lr = 0; // path will not be used unless it speaks again
} }
} else break; } else break;
} }

21
node/Peer.hpp
View File

@ -117,8 +117,8 @@ public:
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i]) {
if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)&&(_paths[i].p->address() == addr)) if ((_paths[i]->address() == addr)&&(_paths[i]->alive(now)))
return true; return true;
} else break; } else break;
} }
@ -290,8 +290,8 @@ 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_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (!_paths[i].p) break; if (!_paths[i]) break;
pp.push_back(_paths[i].p); pp.push_back(_paths[i]);
} }
return pp; return pp;
} }
@ -499,13 +499,6 @@ public:
} }
private: private:
struct _PeerPath
{
_PeerPath() : lr(0),p() {}
int64_t lr; // time of last valid ZeroTier packet
SharedPtr<Path> p;
};
uint8_t _key[ZT_PEER_SECRET_KEY_LENGTH]; uint8_t _key[ZT_PEER_SECRET_KEY_LENGTH];
const RuntimeEnvironment *RR; const RuntimeEnvironment *RR;
@ -517,25 +510,23 @@ private:
int64_t _lastWhoisRequestReceived; int64_t _lastWhoisRequestReceived;
int64_t _lastEchoRequestReceived; int64_t _lastEchoRequestReceived;
int64_t _lastCredentialsReceived; int64_t _lastCredentialsReceived;
int64_t _lastPathPrune;
int64_t _lastACKWindowReset; int64_t _lastACKWindowReset;
int64_t _lastQoSWindowReset; int64_t _lastQoSWindowReset;
int64_t _lastMultipathCompatibilityCheck; int64_t _lastMultipathCompatibilityCheck;
unsigned char _freeRandomByte;
int _uniqueAlivePathCount; int _uniqueAlivePathCount;
bool _localMultipathSupported; bool _localMultipathSupported;
bool _remoteMultipathSupported; bool _remoteMultipathSupported;
bool _canUseMultipath; bool _canUseMultipath;
uint8_t _freeRandomByte;
uint16_t _vProto; uint16_t _vProto;
uint16_t _vMajor; uint16_t _vMajor;
uint16_t _vMinor; uint16_t _vMinor;
uint16_t _vRevision; uint16_t _vRevision;
_PeerPath _paths[ZT_MAX_PEER_NETWORK_PATHS]; SharedPtr<Path> _paths[ZT_MAX_PEER_NETWORK_PATHS];
Mutex _paths_m; Mutex _paths_m;
Identity _id; Identity _id;

5
node/Topology.hpp
View File

@ -46,6 +46,7 @@
#include "InetAddress.hpp" #include "InetAddress.hpp"
#include "Hashtable.hpp" #include "Hashtable.hpp"
#include "Root.hpp" #include "Root.hpp"
#include "SharedPtr.hpp"
namespace ZeroTier { namespace ZeroTier {
@ -246,13 +247,13 @@ public:
* @tparam F function or function object type * @tparam F function or function object type
*/ */
template<typename F> template<typename F>
inline void eachRoot(F f) const inline void eachRoot(F f)
{ {
Mutex::Lock l(_roots_m); Mutex::Lock l(_roots_m);
SharedPtr<Peer> rp; SharedPtr<Peer> rp;
for(std::vector<Root>::const_iterator i(_roots.begin());i!=_roots.end();++i) { for(std::vector<Root>::const_iterator i(_roots.begin());i!=_roots.end();++i) {
{ {
SharedPtr::Lock l2(_peers_m); Mutex::Lock l2(_peers_m);
const SharedPtr<Peer> *const ap = _peers.get(i->address()); const SharedPtr<Peer> *const ap = _peers.get(i->address());
if (ap) { if (ap) {
rp = *ap; rp = *ap;

4
service/OneService.cpp
View File

@ -1998,7 +1998,7 @@ public:
{ {
const Hashtable< uint64_t,std::vector<InetAddress> > *lh = (const Hashtable< uint64_t,std::vector<InetAddress> > *)0; const Hashtable< uint64_t,std::vector<InetAddress> > *lh = (const Hashtable< uint64_t,std::vector<InetAddress> > *)0;
if (family < 0) if (family < 0)
lh = (_node->prng() & 1) ? &_v4Hints : &_v6Hints; lh = (Utils::random() & 1) ? &_v4Hints : &_v6Hints;
else if (family == AF_INET) else if (family == AF_INET)
lh = &_v4Hints; lh = &_v4Hints;
else if (family == AF_INET6) else if (family == AF_INET6)
@ -2006,7 +2006,7 @@ public:
else return 0; else return 0;
const std::vector<InetAddress> *l = lh->get(ztaddr); const std::vector<InetAddress> *l = lh->get(ztaddr);
if ((l)&&(l->size() > 0)) { if ((l)&&(l->size() > 0)) {
memcpy(result,&((*l)[(unsigned long)_node->prng() % l->size()]),sizeof(struct sockaddr_storage)); memcpy(result,&((*l)[(unsigned long)Utils::random() % l->size()]),sizeof(struct sockaddr_storage));
return 1; return 1;
} else return 0; } else return 0;
} }