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

Revert to ancient path redundancy check logic

Browse source
This commit is contained in:
Joseph Henry 2020-07-06 15:18:17 -07:00
parent d0aacfddb7
commit 8eb453e042
1 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
node/Peer.cpp
View file

@ -93,28 +93,11 @@ void Peer::received(
break; break;
} }
if (trustEstablished) { if (trustEstablished) {
_lastTrustEstablishedPacketReceived = now; _lastTrustEstablishedPacketReceived = now;
path->trustedPacketReceived(now); path->trustedPacketReceived(now);
} }
{
Mutex::Lock _l(_paths_m);
recordIncomingPacket(tPtr, path, packetId, payloadLength, verb, now);
if (_canUseMultipath) {
if (path->needsToSendQoS(now)) {
sendQOS_MEASUREMENT(tPtr, path, path->localSocket(), path->address(), now);
}
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) {
_paths[i].p->processBackgroundPathMeasurements(now);
}
}
}
}
if (hops == 0) { if (hops == 0) {
// If this is a direct packet (no hops), update existing paths or learn new ones // If this is a direct packet (no hops), update existing paths or learn new ones
bool havePath = false; bool havePath = false;
@ -135,27 +118,20 @@ void Peer::received(
if ((!havePath)&&(RR->node->shouldUsePathForZeroTierTraffic(tPtr,_id.address(),path->localSocket(),path->address()))) { if ((!havePath)&&(RR->node->shouldUsePathForZeroTierTraffic(tPtr,_id.address(),path->localSocket(),path->address()))) {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
// Paths are redundant if they duplicate an alive path to the same IP or // Paths are redunant if they duplicate an alive path to the same IP or
// with the same local socket and address family. // with the same local socket and address family.
bool redundant = false; bool redundant = false;
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].p) {
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].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())) ) ) {
redundant = true; redundant = true;
break; break;
} }
// If the path is the same address and port, simply assume this is a replacement
if ( (_paths[i].p->address().ipsEqual2(path->address()))) {
replacePath = i;
break;
}
} else break; } else break;
} }
// If the path isn't a duplicate of the same localSocket AND we haven't already determined a replacePath, if (!redundant) {
// then find the worst path and replace it. unsigned int 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].p) {
@ -169,16 +145,16 @@ void Peer::received(
break; break;
} }
} }
}
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].lr = now;
_paths[replacePath].p = path; _paths[replacePath].p = path;
_paths[replacePath].priority = 1; _paths[replacePath].priority = 1;
} else { } else {
attemptToContact = true; attemptToContact = true;
}
} }
} }
} }