From: Matt Joiner <anacrolix@gmail.com>
Date: Sat, 7 May 2016 09:02:30 +0000 (+1000)
Subject: dht: Fix race contacting starting addrs in Announce
X-Git-Tag: v1.0.0~744
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=b9a7cbfa145d548133811719a02e32d927457d89;p=btrtrc.git

dht: Fix race contacting starting addrs in Announce
---

diff --git a/dht/announce.go b/dht/announce.go
index cff0ac73..ead301a4 100644
--- a/dht/announce.go
+++ b/dht/announce.go
@@ -96,13 +96,15 @@ func (s *Server) Announce(infoHash string, port int, impliedPort bool) (*Announc
 		}
 	}()
 	go func() {
+		disc.mu.Lock()
+		defer disc.mu.Unlock()
 		for i, addr := range startAddrs {
 			if i != 0 {
+				disc.mu.Unlock()
 				time.Sleep(time.Millisecond)
+				disc.mu.Lock()
 			}
-			disc.mu.Lock()
 			disc.contact(addr)
-			disc.mu.Unlock()
 		}
 		disc.contactedStartAddrs = true
 		// If we failed to contact any of the starting addrs, no transactions