From 4221552c0b3283d106a7c3a44959a02fefd31af6 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 27 Oct 2015 16:52:44 -0700
Subject: Use getPeerNoCache() in Cluster to avoid keeping all peers cached
 everywhere.

---
 node/Cluster.cpp  |  5 +++--
 node/Topology.hpp | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/node/Cluster.cpp b/node/Cluster.cpp
index 0797d83d..0535f9ee 100644
--- a/node/Cluster.cpp
+++ b/node/Cluster.cpp
@@ -210,6 +210,7 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
 						}	break;
 
 						case STATE_MESSAGE_HAVE_PEER: {
+							const uint64_t now = RR->node->now();
 							Identity id;
 							InetAddress physicalAddress;
 							ptr += id.deserialize(dmsg,ptr);
@@ -217,7 +218,7 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
 							if (id) {
 								// Forget any paths that we have to this peer at its address
 								if (physicalAddress) {
-									SharedPtr<Peer> myPeerRecord(RR->topology->getPeer(id.address()));
+									SharedPtr<Peer> myPeerRecord(RR->topology->getPeerNoCache(id.address(),now));
 									if (myPeerRecord)
 										myPeerRecord->removePathByAddress(physicalAddress);
 								}
@@ -229,7 +230,7 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
 								{
 									Mutex::Lock _l2(_peerAffinities_m);
 									_PA &pa = _peerAffinities[id.address()];
-									pa.ts = RR->node->now();
+									pa.ts = now;
 									pa.mid = fromMemberId;
 		 						}
 		 						TRACE("[%u] has %s @ %s",(unsigned int)fromMemberId,id.address().toString().c_str(),physicalAddress.toString().c_str());
diff --git a/node/Topology.hpp b/node/Topology.hpp
index ee9827b9..16836e07 100644
--- a/node/Topology.hpp
+++ b/node/Topology.hpp
@@ -78,6 +78,23 @@ public:
 	 */
 	SharedPtr<Peer> getPeer(const Address &zta);
 
+	/**
+	 * Get a peer only if it is presently in memory (no disk cache)
+	 *
+	 * @param zta ZeroTier address
+	 * @param now Current time
+	 */
+	inline SharedPtr<Peer> getPeerNoCache(const Address &zta,const uint64_t now)
+	{
+		Mutex::Lock _l(_lock);
+		const SharedPtr<Peer> *ap = _peers.get(zta);
+		if (ap) {
+			(*ap)->use(now);
+			return *ap;
+		}
+		return SharedPtr<Peer>();
+	}
+
 	/**
 	 * Get the identity of a peer
 	 *
-- 
cgit v1.2.3