Browse Source

simplify if

Adam Ierymenko 9 years ago
parent
commit
4d94ae77b4
1 changed files with 13 additions and 15 deletions
  1. 13 15
      node/Peer.cpp

+ 13 - 15
node/Peer.cpp

@@ -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()) >= 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());
-
-			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
-				Packet outp(_id.address(),RR->identity.address(),Packet::VERB_ECHO);
-				outp.armor(_key,true);
-				p.send(RR,outp.data(),outp.size(),now);
-			} else {
-				sendHELLO(p.localAddress(),p.address(),now);
-				p.sent(now);
-			}
-
-			p.increaseProbation();
+	if ( (p.lastSend() > p.lastReceived()) && ((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());
+
+		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
+			Packet outp(_id.address(),RR->identity.address(),Packet::VERB_ECHO);
+			outp.armor(_key,true);
+			p.send(RR,outp.data(),outp.size(),now);
+		} else {
+			sendHELLO(p.localAddress(),p.address(),now);
+			p.sent(now);
 		}
 		}
+
+		p.increaseProbation();
 	}
 	}
 
 
 	return true;
 	return true;