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 44a43619024b98c32c7571cff2537ff29d093fa5..c451aca6732f9c903929256c2723b27605ecedc4 100644 (file)
--- 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 018e3885aa5fd307d49a5e9241a4a645e380240d..f9ee139ef02fc93a0961c5710532d9bf20e22281 100644 (file)
--- 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)