(1) No need to confirm if we are a root (small optimization), (2) Refactor peer affinity tracking.

1 files changed, 34 insertions, 36 deletions

diff --git a/node/Peer.cpp b/node/Peer.cpp
index e56c1eca..99e2156e 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -86,43 +86,41 @@ void Peer::received(
 		// Note: findBetterEndpoint() is first since we still want to check
 		// for a better endpoint even if we don't actually send a redirect.
 		if ( (RR->cluster->findBetterEndpoint(redirectTo,_id.address(),remoteAddr,false)) && (verb != Packet::VERB_OK)&&(verb != Packet::VERB_ERROR)&&(verb != Packet::VERB_RENDEZVOUS)&&(verb != Packet::VERB_PUSH_DIRECT_PATHS) ) {
-			if ((redirectTo.ss_family == AF_INET)||(redirectTo.ss_family == AF_INET6)) {
-				if (_vProto >= 5) {
-					// For newer peers we can send a more idiomatic verb: PUSH_DIRECT_PATHS.
-					Packet outp(_id.address(),RR->identity.address(),Packet::VERB_PUSH_DIRECT_PATHS);
-					outp.append((uint16_t)1); // count == 1
-					outp.append((uint8_t)0); // no flags
-					outp.append((uint16_t)0); // no extensions
-					if (redirectTo.ss_family == AF_INET) {
-						outp.append((uint8_t)4);
-						outp.append((uint8_t)6);
-						outp.append(redirectTo.rawIpData(),4);
-					} else {
-						outp.append((uint8_t)6);
-						outp.append((uint8_t)18);
-						outp.append(redirectTo.rawIpData(),16);
-					}
-					outp.append((uint16_t)redirectTo.port());
-					outp.armor(_key,true);
-					RR->antiRec->logOutgoingZT(outp.data(),outp.size());
-					RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
+			if (_vProto >= 5) {
+				// For newer peers we can send a more idiomatic verb: PUSH_DIRECT_PATHS.
+				Packet outp(_id.address(),RR->identity.address(),Packet::VERB_PUSH_DIRECT_PATHS);
+				outp.append((uint16_t)1); // count == 1
+				outp.append((uint8_t)0); // no flags
+				outp.append((uint16_t)0); // no extensions
+				if (redirectTo.ss_family == AF_INET) {
+					outp.append((uint8_t)4);
+					outp.append((uint8_t)6);
+					outp.append(redirectTo.rawIpData(),4);
 				} else {
-					// For older peers we use RENDEZVOUS to coax them into contacting us elsewhere.
-					Packet outp(_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS);
-					outp.append((uint8_t)0); // no flags
-					RR->identity.address().appendTo(outp);
-					outp.append((uint16_t)redirectTo.port());
-					if (redirectTo.ss_family == AF_INET) {
-						outp.append((uint8_t)4);
-						outp.append(redirectTo.rawIpData(),4);
-					} else {
-						outp.append((uint8_t)16);
-						outp.append(redirectTo.rawIpData(),16);
-					}
-					outp.armor(_key,true);
-					RR->antiRec->logOutgoingZT(outp.data(),outp.size());
-					RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
+					outp.append((uint8_t)6);
+					outp.append((uint8_t)18);
+					outp.append(redirectTo.rawIpData(),16);
 				}
+				outp.append((uint16_t)redirectTo.port());
+				outp.armor(_key,true);
+				RR->antiRec->logOutgoingZT(outp.data(),outp.size());
+				RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
+			} else {
+				// For older peers we use RENDEZVOUS to coax them into contacting us elsewhere.
+				Packet outp(_id.address(),RR->identity.address(),Packet::VERB_RENDEZVOUS);
+				outp.append((uint8_t)0); // no flags
+				RR->identity.address().appendTo(outp);
+				outp.append((uint16_t)redirectTo.port());
+				if (redirectTo.ss_family == AF_INET) {
+					outp.append((uint8_t)4);
+					outp.append(redirectTo.rawIpData(),4);
+				} else {
+					outp.append((uint8_t)16);
+					outp.append(redirectTo.rawIpData(),16);
+				}
+				outp.armor(_key,true);
+				RR->antiRec->logOutgoingZT(outp.data(),outp.size());
+				RR->node->putPacket(localAddr,remoteAddr,outp.data(),outp.size());
 			}
 		}
 	}
@@ -167,7 +165,7 @@ void Peer::received(
 			}
 
 			if (!pathIsConfirmed) {
-				if (verb == Packet::VERB_OK) {
+				if ((verb == Packet::VERB_OK)||(RR->topology->amRoot())) {
 
 					Path *slot = (Path *)0;
 					if (np < ZT_MAX_PEER_NETWORK_PATHS) {