Announce that we have peers on the cluster when we first see them to improve startup times, and add a result crunching script to tests/http.

3 files changed, 25 insertions, 0 deletions

diff --git a/node/Cluster.cpp b/node/Cluster.cpp
index a819372e..ab074b6d 100644
--- a/node/Cluster.cpp
+++ b/node/Cluster.cpp
@@ -363,6 +363,17 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
 	}
 }
 
+void Cluster::broadcastHavePeer(const Identity &id)
+{
+	Buffer<1024> buf;
+	id.serialize(buf);
+	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,CLUSTER_MESSAGE_HAVE_PEER,buf.data(),buf.size());
+	}
+}
+
 void Cluster::sendViaCluster(const Address &fromPeerAddress,const Address &toPeerAddress,const void *data,unsigned int len,bool unite)
 {
 	if (len > ZT_PROTO_MAX_PACKET_LENGTH) // sanity check
diff --git a/node/Cluster.hpp b/node/Cluster.hpp
index 1c4331b4..6a7cf7ad 100644
--- a/node/Cluster.hpp
+++ b/node/Cluster.hpp
@@ -245,6 +245,15 @@ public:
 	void handleIncomingStateMessage(const void *msg,unsigned int len);
 
 	/**
+	 * Broadcast that we have a given peer
+	 *
+	 * This should be done when new peers are first contacted.
+	 *
+	 * @param id Identity of peer
+	 */
+	void broadcastHavePeer(const Identity &id);
+
+	/**
 	 * Send this packet via another node in this cluster if another node has this peer
 	 *
 	 * This is used in the outgoing packet and relaying logic in Switch to
diff --git a/node/Peer.cpp b/node/Peer.cpp
index de6f00c2..d728cf4c 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -187,6 +187,11 @@ void Peer::received(
 						_sortPaths(now);
 					}
 
+#ifdef ZT_ENABLE_CLUSTER
+					if ((RR->cluster)&&(!suboptimalPath))
+						RR->cluster->broadcastHavePeer(_id);
+#endif
+
 				} else {
 
 					/* If this path is not known, send a HELLO. We don't learn