Further pare down Cluster messaging and rename some stuff.

7 files changed, 24 insertions, 40 deletions

diff --git a/node/Cluster.cpp b/node/Cluster.cpp
index e9c5856f..dc7ecab2 100644
--- a/node/Cluster.cpp
+++ b/node/Cluster.cpp
@@ -214,19 +214,10 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
 
 						case STATE_MESSAGE_HAVE_PEER: {
 							const Address zeroTierAddress(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH;
-							InetAddress physicalAddress;
-							ptr += physicalAddress.deserialize(dmsg,ptr);
-							if (physicalAddress) {
-								SharedPtr<Peer> myPeerRecord(RR->topology->getPeerNoCache(zeroTierAddress));
-								if (myPeerRecord)
-									myPeerRecord->removePathByAddress(physicalAddress);
-							}
-							{
-								Mutex::Lock _l2(_peerAffinities_m);
-								_PA &pa = _peerAffinities[zeroTierAddress];
-								pa.ts = RR->node->now();
-								pa.mid = fromMemberId;
-							}
+							Mutex::Lock _l2(_peerAffinities_m);
+							_PA &pa = _peerAffinities[zeroTierAddress];
+							pa.ts = RR->node->now();
+							pa.mid = fromMemberId;
 							TRACE("[%u] has %s @ %s",(unsigned int)fromMemberId,id.address().toString().c_str(),physicalAddress.toString().c_str());
 						}	break;
 
@@ -402,7 +393,7 @@ bool Cluster::sendViaCluster(const Address &fromPeerAddress,const Address &toPee
 	return true;
 }
 
-void Cluster::replicateHavePeer(const Identity &peerId,const InetAddress &physicalAddress)
+void Cluster::replicateHavePeer(const Identity &peerId)
 {
 	const uint64_t now = RR->node->now();
 	{
@@ -420,14 +411,13 @@ void Cluster::replicateHavePeer(const Identity &peerId,const InetAddress &physic
 		}
 	}
 
-	Buffer<1024> buf;
-	peerId.address().appendTo(buf);
-	physicalAddress.serialize(buf);
+	char buf[ZT_ADDRESS_LENGTH];
+	peerId.address().copyTo(buf,ZT_ADDRESS_LENGTH);
 	{
 		Mutex::Lock _l(_memberIds_m);
 		for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
 			Mutex::Lock _l2(_members[*mid].lock);
-			_send(*mid,STATE_MESSAGE_HAVE_PEER,buf.data(),buf.size());
+			_send(*mid,STATE_MESSAGE_HAVE_PEER,buf,ZT_ADDRESS_LENGTH);
 		}
 	}
 }
@@ -472,9 +462,8 @@ struct _ClusterAnnouncePeers
 	Cluster *const parent;
 	inline void operator()(const Topology &t,const SharedPtr<Peer> &peer) const
 	{
-		Path *p = peer->getBestPath(now);
-		if (p)
-			parent->replicateHavePeer(peer->identity(),p->address());
+		if (peer->hasActiveDirectPath(now))
+			parent->replicateHavePeer(peer->identity());
 	}
 };
 void Cluster::doPeriodicTasks()
diff --git a/node/Cluster.hpp b/node/Cluster.hpp
index 22297506..73391114 100644
--- a/node/Cluster.hpp
+++ b/node/Cluster.hpp
@@ -125,10 +125,6 @@ public:
 		/**
 		 * Cluster member has this peer:
 		 *   <[5] ZeroTier address of peer>
-		 *   <[...] binary serialized peer remote physical address>
-		 *
-		 * Clusters send this message when they learn a path to a peer. The
-		 * replicated physical address is the one learned.
 		 */
 		STATE_MESSAGE_HAVE_PEER = 2,
 
@@ -237,9 +233,8 @@ public:
 	 * Advertise to the cluster that we have this peer
 	 *
 	 * @param peerId Identity of peer that we have
-	 * @param physicalAddress Physical address of peer (from our POV)
 	 */
-	void replicateHavePeer(const Identity &peerId,const InetAddress &physicalAddress);
+	void replicateHavePeer(const Identity &peerId);
 
 	/**
 	 * Advertise a multicast LIKE to the cluster
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index f2216235..26339b00 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -972,7 +972,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,const Sha
 					if ( ((flags & 0x01) == 0) && (Path::isAddressValidForPath(a)) ) {
 						if (++countPerScope[(int)a.ipScope()][0] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) {
 							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
-							peer->attemptToContactAt(RR,_localAddress,a,now);
+							peer->sendHELLO(RR,_localAddress,a,now);
 						} else {
 							TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
 						}
@@ -983,7 +983,7 @@ bool IncomingPacket::_doPUSH_DIRECT_PATHS(const RuntimeEnvironment *RR,const Sha
 					if ( ((flags & 0x01) == 0) && (Path::isAddressValidForPath(a)) ) {
 						if (++countPerScope[(int)a.ipScope()][1] <= ZT_PUSH_DIRECT_PATHS_MAX_PER_SCOPE_AND_FAMILY) {
 							TRACE("attempting to contact %s at pushed direct path %s",peer->address().toString().c_str(),a.toString().c_str());
-							peer->attemptToContactAt(RR,_localAddress,a,now);
+							peer->sendHELLO(RR,_localAddress,a,now);
 						} else {
 							TRACE("ignoring contact for %s at %s -- too many per scope",peer->address().toString().c_str(),a.toString().c_str());
 						}
diff --git a/node/Node.cpp b/node/Node.cpp
index bcf5db1a..6ba038eb 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -249,7 +249,7 @@ public:
 			} else {
 				if (stableEndpoint4) {
 					needToContactIndirect = false;
-					p->attemptToContactAt(RR,InetAddress(),stableEndpoint4,_now);
+					p->sendHELLO(RR,InetAddress(),stableEndpoint4,_now);
 				}
 			}
 			if (p->doPingAndKeepalive(RR,_now,AF_INET6)) {
@@ -257,7 +257,7 @@ public:
 			} else {
 				if (stableEndpoint6) {
 					needToContactIndirect = false;
-					p->attemptToContactAt(RR,InetAddress(),stableEndpoint6,_now);
+					p->sendHELLO(RR,InetAddress(),stableEndpoint6,_now);
 				}
 			}
 
diff --git a/node/Peer.cpp b/node/Peer.cpp
index 0b981c8e..d3394da6 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -188,7 +188,7 @@ void Peer::received(
 					if ((now - _lastPathConfirmationSent) >= ZT_MIN_PATH_CONFIRMATION_INTERVAL) {
 						_lastPathConfirmationSent = now;
 						TRACE("got %s via unknown path %s(%s), confirming...",Packet::verbString(verb),_id.address().toString().c_str(),remoteAddr.toString().c_str());
-						attemptToContactAt(RR,localAddr,remoteAddr,now);
+						sendHELLO(RR,localAddr,remoteAddr,now);
 					}
 
 				}
@@ -198,7 +198,7 @@ void Peer::received(
 
 #ifdef ZT_ENABLE_CLUSTER
 	if ((RR->cluster)&&(pathIsConfirmed))
-		RR->cluster->replicateHavePeer(_id,remoteAddr);
+		RR->cluster->replicateHavePeer(_id);
 #endif
 
 	if (needMulticastGroupAnnounce) {
@@ -208,7 +208,7 @@ void Peer::received(
 	}
 }
 
-void Peer::attemptToContactAt(const RuntimeEnvironment *RR,const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now)
+void Peer::sendHELLO(const RuntimeEnvironment *RR,const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now)
 {
 	// _lock not required here since _id is immutable and nothing else is accessed
 
@@ -242,7 +242,7 @@ bool Peer::doPingAndKeepalive(const RuntimeEnvironment *RR,uint64_t now,int inet
 	if (p) {
 		if ((now - p->lastReceived()) >= ZT_PEER_DIRECT_PING_DELAY) {
 			//TRACE("PING %s(%s) after %llums/%llums send/receive inactivity",_id.address().toString().c_str(),p->address().toString().c_str(),now - p->lastSend(),now - p->lastReceived());
-			attemptToContactAt(RR,p->localAddress(),p->address(),now);
+			sendHELLO(RR,p->localAddress(),p->address(),now);
 			p->sent(now);
 		} else if (((now - p->lastSend()) >= ZT_NAT_KEEPALIVE_DELAY)&&(!p->reliable())) {
 			//TRACE("NAT keepalive %s(%s) after %llums/%llums send/receive inactivity",_id.address().toString().c_str(),p->address().toString().c_str(),now - p->lastSend(),now - p->lastReceived());
@@ -348,7 +348,7 @@ bool Peer::resetWithinScope(const RuntimeEnvironment *RR,InetAddress::IpScope sc
 	unsigned int y = 0;
 	while (x < np) {
 		if (_paths[x].address().ipScope() == scope) {
-			attemptToContactAt(RR,_paths[x].localAddress(),_paths[x].address(),now);
+			sendHELLO(RR,_paths[x].localAddress(),_paths[x].address(),now);
 		} else {
 			_paths[y++] = _paths[x];
 		}
diff --git a/node/Peer.hpp b/node/Peer.hpp
index a70d9868..42708128 100644
--- a/node/Peer.hpp
+++ b/node/Peer.hpp
@@ -171,7 +171,7 @@ public:
 	 * @param atAddress Destination address
 	 * @param now Current time
 	 */
-	void attemptToContactAt(const RuntimeEnvironment *RR,const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now);
+	void sendHELLO(const RuntimeEnvironment *RR,const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now);
 
 	/**
 	 * Send pings or keepalives depending on configured timeouts
diff --git a/node/Switch.cpp b/node/Switch.cpp
index 8d3c12f5..4d6dacff 100644
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@@ -435,7 +435,7 @@ void Switch::rendezvous(const SharedPtr<Peer> &peer,const InetAddress &localAddr
 {
 	TRACE("sending NAT-t message to %s(%s)",peer->address().toString().c_str(),atAddr.toString().c_str());
 	const uint64_t now = RR->node->now();
-	peer->attemptToContactAt(RR,localAddr,atAddr,now);
+	peer->sendHELLO(RR,localAddr,atAddr,now);
 	{
 		Mutex::Lock _l(_contactQueue_m);
 		_contactQueue.push_back(ContactQueueEntry(peer,now + ZT_NAT_T_TACTICAL_ESCALATION_DELAY,localAddr,atAddr));
@@ -508,14 +508,14 @@ unsigned long Switch::doTimerTasks(uint64_t now)
 				} else {
 					if (qi->strategyIteration == 0) {
 						// First strategy: send packet directly to destination
-						qi->peer->attemptToContactAt(RR,qi->localAddr,qi->inaddr,now);
+						qi->peer->sendHELLO(RR,qi->localAddr,qi->inaddr,now);
 					} else if (qi->strategyIteration <= 4) {
 						// Strategies 1-4: try escalating ports for symmetric NATs that remap sequentially
 						InetAddress tmpaddr(qi->inaddr);
 						int p = (int)qi->inaddr.port() + qi->strategyIteration;
 						if (p < 0xffff) {
 							tmpaddr.setPort((unsigned int)p);
-							qi->peer->attemptToContactAt(RR,qi->localAddr,tmpaddr,now);
+							qi->peer->sendHELLO(RR,qi->localAddr,tmpaddr,now);
 						} else qi->strategyIteration = 5;
 					} else {
 						// All strategies tried, expire entry