Merge pull request #965 from subtly/patch-1

Better UDP & interop. Limit all received datagrams to 1280bytes.

1 files changed, 12 insertions, 2 deletions

diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go
index f175835a8..7bf6df5ab 100644
--- a/p2p/discover/udp_test.go
+++ b/p2p/discover/udp_test.go
@@ -163,9 +163,9 @@ 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 {
@@ -174,6 +174,16 @@ func TestUDP_findnode(t *testing.T) {
 			}
 		}
 	})
+	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 {
+			if p.Nodes[i].ID != expected.entries[i + 13].ID {
+				t.Errorf("result mismatch at %d:\n  got:  %v\n  want: %v", i, p.Nodes[i], expected.entries[i])
+			}
+		}
+	})
 }
 
 func TestUDP_findnodeMultiReply(t *testing.T) {