From a32693770c607a17eab6d8d068e4c9b1cddbbd54 Mon Sep 17 00:00:00 2001
From: subtly <subtly@users.noreply.github.com>
Date: Wed, 13 May 2015 20:03:17 +0200
Subject: Manual send of multiple neighbours packets. Test receiving multiple
neighbours packets.
---
p2p/discover/udp.go | 8 +++++++-
p2p/discover/udp_test.go | 14 ++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
(limited to 'p2p/discover')
diff --git a/p2p/discover/udp.go b/p2p/discover/udp.go
index ab3559ad8..2b215b45c 100644
--- a/p2p/discover/udp.go
+++ b/p2p/discover/udp.go
@@ -510,9 +510,15 @@ func (req *findnode) handle(t *udp, from *net.UDPAddr, fromID NodeID, mac []byte
closestrpc[i] = nodeToRPC(n)
}
t.send(from, neighborsPacket, neighbors{
- Nodes: closestrpc,
+ Nodes: closestrpc[:13],
Expiration: uint64(time.Now().Add(expiration).Unix()),
})
+ if len(closestrpc) > 13 {
+ t.send(from, neighborsPacket, neighbors{
+ Nodes: closestrpc[13:],
+ Expiration: uint64(time.Now().Add(expiration).Unix()),
+ })
+ }
return nil
}
diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go
index f175835a8..ae9e41251 100644
--- a/p2p/discover/udp_test.go
+++ b/p2p/discover/udp_test.go
@@ -163,9 +163,19 @@ func TestUDP_findnode(t *testing.T) {
))
// check that closest neighbors are returned.
test.packetIn(nil, findnodePacket, &findnode{Target: testTarget, Expiration: futureExp})
+ expected := test.table.closest(targetHash, bucketSize)
test.waitPacketOut(func(p *neighbors) {
- expected := test.table.closest(targetHash, bucketSize)
- if len(p.Nodes) != bucketSize {
+ if len(p.Nodes) != 13 {
+ t.Errorf("wrong number of results: got %d, want %d", len(p.Nodes), bucketSize)
+ }
+ for i := range p.Nodes {
+ if p.Nodes[i].ID != expected.entries[i].ID {
+ t.Errorf("result mismatch at %d:\n got: %v\n want: %v", i, p.Nodes[i], expected.entries[i])
+ }
+ }
+ })
+ test.waitPacketOut(func(p *neighbors) {
+ if len(p.Nodes) != 3 {
t.Errorf("wrong number of results: got %d, want %d", len(p.Nodes), bucketSize)
}
for i := range p.Nodes {
--
cgit v1.2.3