From df0928bfafbcaf71f62fea5d6bae5bf2cbf5a58e Mon Sep 17 00:00:00 2001
From: zelig <viktor.tron@gmail.com>
Date: Sat, 12 Jan 2019 14:49:02 +0100
Subject: [PATCH] swarm/network: kademlia suggestPeer algo correction

---
 swarm/network/kademlia.go | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/swarm/network/kademlia.go b/swarm/network/kademlia.go
index 4d9dcd3624..997db08a67 100644
--- a/swarm/network/kademlia.go
+++ b/swarm/network/kademlia.go
@@ -214,12 +214,24 @@ func (k *Kademlia) SuggestPeer() (a *BzzAddr, o int, want bool) {
 		return nil, 0, false
 	}
 	// find the first callable peer
-	nxt := bpo[0]
-	k.addrs.EachBin(k.base, Pof, nxt, func(po, _ int, f func(func(pot.Val) bool) bool) bool {
-		// for each bin (up until depth) we find callable candidate peers
+	// for each bin (up until neighbourhood radius) we find callable candidate peers
+	// nxt := bpo[0]
+	ci := 0
+	saturationDepth := bpo[0]
+	cpo := saturationDepth
+	k.addrs.EachBin(k.base, Pof, cpo, func(po, _ int, f func(func(pot.Val) bool) bool) bool {
 		if po >= radius {
 			return false
 		}
+		if po < cpo {
+			return true
+		}
+		for ; ci < len(bpo) && cpo < po; ci++ {
+			cpo = bpo[ci]
+		}
+		if ci == len(bpo) {
+			return false
+		}
 		return f(func(val pot.Val) bool {
 			e := val.(*entry)
 			c := k.callable(e)
@@ -235,11 +247,11 @@ func (k *Kademlia) SuggestPeer() (a *BzzAddr, o int, want bool) {
 	}
 	// no candidate peer found, request for the short bin
 	var changed bool
-	if uint8(nxt) < k.depth {
-		k.depth = uint8(nxt)
+	if uint8(saturationDepth) < k.depth {
+		k.depth = uint8(saturationDepth)
 		changed = true
 	}
-	return a, nxt, changed
+	return a, saturationDepth, changed
 }
 
 // On inserts the peer as a kademlia peer into the live peers