From c303ce09d8affe2936da80b01002889f5820bcc5 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Sun, 11 Jan 2015 21:42:57 +1100
Subject: [PATCH] Fix a few tests

---
 client_test.go | 13 +++++++++++++
 dht/dht.go     |  8 ++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/client_test.go b/client_test.go
index 9d9717b5..d29afc89 100644
--- a/client_test.go
+++ b/client_test.go
@@ -17,6 +17,7 @@ import (
 func TestClientDefault(t *testing.T) {
 	cl, err := NewClient(&Config{
 		NoDefaultBlocklist: true,
+		ListenAddr:         ":0",
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -178,3 +179,15 @@ func TestUTPRawConn(t *testing.T) {
 		t.Fatalf("messages received: %d", msgsReceived)
 	}
 }
+
+func TestTwoClientsArbitraryPorts(t *testing.T) {
+	for i := 0; i < 2; i++ {
+		cl, err := NewClient(&Config{
+			ListenAddr: ":0",
+		})
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer cl.Stop()
+	}
+}
diff --git a/dht/dht.go b/dht/dht.go
index afb92b30..afc67dfe 100644
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -65,7 +65,7 @@ func (ca cachedAddr) UDPAddr() *net.UDPAddr {
 	return ca.a.(*net.UDPAddr)
 }
 
-func newDHTAddr(addr *net.UDPAddr) dHTAddr {
+func newDHTAddr(addr net.Addr) dHTAddr {
 	return cachedAddr{addr, addr.String()}
 }
 
@@ -499,7 +499,7 @@ func (s *Server) serve() error {
 			logonce.Stderr.Printf("received dht packet exceeds buffer size")
 			continue
 		}
-		s.processPacket(b[:n], newDHTAddr(addr.(*net.UDPAddr)))
+		s.processPacket(b[:n], newDHTAddr(addr))
 	}
 }
 
@@ -991,8 +991,8 @@ func (s *Server) bootstrap() (err error) {
 			var t *transaction
 			t, err = s.findNode(node.addr, s.id)
 			if err != nil {
-				log.Printf("error sending find_node: %s", err)
-				continue
+				err = fmt.Errorf("error sending find_node: %s", err)
+				return
 			}
 			outstanding.Add(1)
 			go func() {
-- 
2.48.1