From 9e7c778cc8ebdfd5d3f773a7d3cb30ad154e7189 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 27 Jan 2017 16:16:06 -0800
Subject: Fix deadlock.

---
 node/Node.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'node/Node.cpp')

diff --git a/node/Node.cpp b/node/Node.cpp
index c4a40395..3d5b5c3d 100644
--- a/node/Node.cpp
+++ b/node/Node.cpp
@@ -159,7 +159,8 @@ public:
 	_PingPeersThatNeedPing(const RuntimeEnvironment *renv,uint64_t now) :
 		lastReceiveFromUpstream(0),
 		RR(renv),
-		_now(now)
+		_now(now),
+		_bestCurrentUpstream(RR->topology->getUpstreamPeer())
 	{
 		RR->topology->getUpstreamStableEndpoints(_upstreams);
 	}
@@ -194,8 +195,11 @@ public:
 				}
 			} else contacted = true;
 
-			if (!contacted)
-				p->sendHELLO(InetAddress(),InetAddress(),_now);
+			if ((!contacted)&&(_bestCurrentUpstream)) {
+				const SharedPtr<Path> up(_bestCurrentUpstream->getBestPath(_now,true));
+				if (up)
+					p->sendHELLO(up->localAddress(),up->address(),_now);
+			}
 
 			lastReceiveFromUpstream = std::max(p->lastReceive(),lastReceiveFromUpstream);
 		} else if (p->isActive(_now)) {
@@ -205,7 +209,8 @@ public:
 
 private:
 	const RuntimeEnvironment *RR;
-	uint64_t _now;
+	const uint64_t _now;
+	const SharedPtr<Peer> _bestCurrentUpstream;
 	Hashtable< Address,std::vector<InetAddress> > _upstreams;
 };
 
-- 
cgit v1.2.3