ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify if

Browse Source
This commit is contained in:
Adam Ierymenko 2016-01-05 16:48:35 -08:00
parent d8143a5e18
commit 4d94ae77b4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
node/Peer.cpp
View File

@ -491,22 +491,20 @@ bool Peer::_checkPath(Path &p,const uint64_t now)
if (!p.active(now)) if (!p.active(now))
return false; return false;
if (p.lastSend() > p.lastReceived()) { if ( (p.lastSend() > p.lastReceived()) && ((p.lastSend() - p.lastReceived()) >= ZT_PEER_DEAD_PATH_DETECTION_NO_ANSWER_TIMEOUT) ) {
if ((p.lastSend() - p.lastReceived()) >= ZT_PEER_DEAD_PATH_DETECTION_NO_ANSWER_TIMEOUT) { TRACE("%s(%s) has not answered, checking if dead (probation: %u)",_id.address().toString().c_str(),p.address().toString().c_str(),p.probation());
TRACE("%s(%s) has not answered, checking if dead (probation: %u)",_id.address().toString().c_str(),p.address().toString().c_str(),p.probation());
if ( (_vProto >= 5) && ( !((_vMajor == 1)&&(_vMinor == 1)&&(_vRevision == 0)) ) ) { if ( (_vProto >= 5) && ( !((_vMajor == 1)&&(_vMinor == 1)&&(_vRevision == 0)) ) ) {
// 1.1.1 and newer nodes support ECHO, which is smaller -- but 1.1.0 has a bug so use HELLO there too // 1.1.1 and newer nodes support ECHO, which is smaller -- but 1.1.0 has a bug so use HELLO there too
Packet outp(_id.address(),RR->identity.address(),Packet::VERB_ECHO); Packet outp(_id.address(),RR->identity.address(),Packet::VERB_ECHO);
outp.armor(_key,true); outp.armor(_key,true);
p.send(RR,outp.data(),outp.size(),now); p.send(RR,outp.data(),outp.size(),now);
} else { } else {
sendHELLO(p.localAddress(),p.address(),now); sendHELLO(p.localAddress(),p.address(),now);
p.sent(now); p.sent(now);
}
p.increaseProbation();
} }
p.increaseProbation();
} }
return true; return true;