From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 17 Aug 2015 16:11:48 +0000 (+1000)
Subject: dht: Use passive from server config
X-Git-Tag: v1.0.0~1062
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=74d35986563796c5db1f5048b6e40b9da2907982;p=btrtrc.git

dht: Use passive from server config
---

diff --git a/dht/dht.go b/dht/dht.go
index bca1c778..db886b46 100644
--- a/dht/dht.go
+++ b/dht/dht.go
@@ -50,7 +50,6 @@ type Server struct {
 	nodes            map[string]*node // Keyed by dHTAddr.String().
 	mu               sync.Mutex
 	closed           chan struct{}
-	passive          bool // Don't respond to queries.
 	ipBlockList      *iplist.IPList
 	badNodes         *boom.BloomFilter
 
@@ -139,7 +138,6 @@ func NewServer(c *ServerConfig) (s *Server, err error) {
 			return
 		}
 	}
-	s.passive = c.Passive
 	s.bootstrapNodes = c.BootstrapNodes
 	err = s.init()
 	if err != nil {
@@ -722,7 +720,7 @@ func (s *Server) handleQuery(source dHTAddr, m Msg) {
 	node.SetIDFromString(args["id"].(string))
 	node.lastGotQuery = time.Now()
 	// Don't respond.
-	if s.passive {
+	if s.config.Passive {
 		return
 	}
 	switch m["q"] {