itImplement "-d" flag in dam-client to allow not fetching remote directories. - tordam - A library for peer discovery inside the Tor network Err parazyd.org 70 hgit clone https://git.parazyd.org/tordam URL:https://git.parazyd.org/tordam parazyd.org 70 1Log /git/tordam/log.gph parazyd.org 70 1Files /git/tordam/files.gph parazyd.org 70 1Refs /git/tordam/refs.gph parazyd.org 70 1README /git/tordam/file/README.md.gph parazyd.org 70 1LICENSE /git/tordam/file/LICENSE.gph parazyd.org 70 i--- Err parazyd.org 70 1commit c92808cd8466674fedd351839a82317d65e468df /git/tordam/commit/c92808cd8466674fedd351839a82317d65e468df.gph parazyd.org 70 1parent 7def56bf98aecf7c77ff680a5686f462de7be033 /git/tordam/commit/7def56bf98aecf7c77ff680a5686f462de7be033.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Thu, 19 Jul 2018 16:50:35 +0200 Err parazyd.org 70 i Err parazyd.org 70 iImplement "-d" flag in dam-client to allow not fetching remote directories. Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M cmd/dam-client/main.go | 24 ++++++++++++++++++------ Err parazyd.org 70 i M pkg/damlib/config.go | 4 ++++ Err parazyd.org 70 i Err parazyd.org 70 i2 files changed, 22 insertions(+), 6 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/cmd/dam-client/main.go b/cmd/dam-client/main.go /git/tordam/file/cmd/dam-client/main.go.gph parazyd.org 70 it@@ -28,6 +28,7 @@ import ( Err parazyd.org 70 i "crypto/rsa" Err parazyd.org 70 i "encoding/base64" Err parazyd.org 70 i "encoding/json" Err parazyd.org 70 i+ "flag" Err parazyd.org 70 i "io/ioutil" Err parazyd.org 70 i "log" Err parazyd.org 70 i "math/big" Err parazyd.org 70 it@@ -155,13 +156,15 @@ func fetchDirlist(locations []string) ([]string, error) { Err parazyd.org 70 i log.Println("Grabbing a list of directories.") Err parazyd.org 70 i Err parazyd.org 70 i // Remote network entry points Err parazyd.org 70 i- for _, i := range locations { Err parazyd.org 70 i- log.Println("Fetching", i) Err parazyd.org 70 i- dirs, err := lib.HTTPDownload(i) Err parazyd.org 70 i- if err != nil { Err parazyd.org 70 i- return nil, err Err parazyd.org 70 i+ if !(lib.Noremote) { Err parazyd.org 70 i+ for _, i := range locations { Err parazyd.org 70 i+ log.Println("Fetching", i) Err parazyd.org 70 i+ dirs, err := lib.HTTPDownload(i) Err parazyd.org 70 i+ if err != nil { Err parazyd.org 70 i+ return nil, err Err parazyd.org 70 i+ } Err parazyd.org 70 i+ dirSlice = lib.ParseDirs(dirSlice, dirs) Err parazyd.org 70 i } Err parazyd.org 70 i- dirSlice = lib.ParseDirs(dirSlice, dirs) Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i // Local ~/.dam/directories.txt Err parazyd.org 70 it@@ -202,6 +205,15 @@ func fetchDirlist(locations []string) ([]string, error) { Err parazyd.org 70 i } Err parazyd.org 70 i Err parazyd.org 70 i func main() { Err parazyd.org 70 i+ var d bool Err parazyd.org 70 i+ Err parazyd.org 70 i+ flag.BoolVar(&d, "d", false, "Don't fetch remote entry points") Err parazyd.org 70 i+ flag.Parse() Err parazyd.org 70 i+ Err parazyd.org 70 i+ if d { Err parazyd.org 70 i+ lib.Noremote = true Err parazyd.org 70 i+ } Err parazyd.org 70 i+ Err parazyd.org 70 i if _, err := os.Stat(lib.Cwd); os.IsNotExist(err) { Err parazyd.org 70 i err := os.Mkdir(lib.Cwd, 0700) Err parazyd.org 70 i lib.CheckError(err) Err parazyd.org 70 1diff --git a/pkg/damlib/config.go b/pkg/damlib/config.go /git/tordam/file/pkg/damlib/config.go.gph parazyd.org 70 it@@ -50,3 +50,7 @@ const DirPort = 49371 Err parazyd.org 70 i // Testnet is flipped with a flag in dam-dir and represents if all new Err parazyd.org 70 i // nodes are initially marked valid or not. Err parazyd.org 70 i var Testnet = false Err parazyd.org 70 i+ Err parazyd.org 70 i+// Noremote is flipped with a flag in dam-client and disables fetching Err parazyd.org 70 i+// remote entry points (directories) if enabled. Err parazyd.org 70 i+var Noremote = false Err parazyd.org 70 .