From: Matt Joiner <anacrolix@gmail.com>
Date: Fri, 25 Aug 2017 06:28:27 +0000 (+1000)
Subject: dht.ServerConfig.StartingNodes is now a function
X-Git-Tag: v1.0.0~438
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=401974dd8d1490fc10b86ca932306df3b242f4a8;p=btrtrc.git

dht.ServerConfig.StartingNodes is now a function

Additionally cmd/torrentfs uses the global bootstrap nodes for its DHT. Aids with https://github.com/anacrolix/torrent/issues/180
---

diff --git a/client.go b/client.go
index 44a43619..c451aca6 100644
--- a/client.go
+++ b/client.go
@@ -227,13 +227,7 @@ func NewClient(cfg *Config) (cl *Client, err error) {
 	if cfg == nil {
 		cfg = &Config{
 			DHTConfig: dht.ServerConfig{
-				StartingNodes: func() []dht.Addr {
-					addrs, err := dht.GlobalBootstrapAddrs()
-					if err != nil {
-						log.Printf("error getting dht bootstrap addrs for default torrent client config: %s", err)
-					}
-					return addrs
-				}(),
+				StartingNodes: dht.GlobalBootstrapAddrs,
 			},
 		}
 	}
diff --git a/cmd/torrentfs/main.go b/cmd/torrentfs/main.go
index 018e3885..f9ee139e 100644
--- a/cmd/torrentfs/main.go
+++ b/cmd/torrentfs/main.go
@@ -16,6 +16,7 @@ import (
 
 	"bazil.org/fuse"
 	fusefs "bazil.org/fuse/fs"
+	"github.com/anacrolix/dht"
 	_ "github.com/anacrolix/envpprof"
 
 	"github.com/anacrolix/torrent"
@@ -102,6 +103,9 @@ func mainExitCode() int {
 		DisableTrackers: *disableTrackers,
 		ListenAddr:      *listenAddr,
 		NoUpload:        true, // Ensure that downloads are responsive.
+		DHTConfig: dht.ServerConfig{
+			StartingNodes: dht.GlobalBootstrapAddrs,
+		},
 	})
 	if err != nil {
 		log.Print(err)