itAdd a flag in dam-client for a dynamic portmap. - 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 31e003e1deb00e8611d652d77c12b763f8ba96a3	/git/tordam/commit/31e003e1deb00e8611d652d77c12b763f8ba96a3.gph	parazyd.org	70
1parent 7a8f7cbade62be63c5ff6eaaa36a258f4c12c25f	/git/tordam/commit/7a8f7cbade62be63c5ff6eaaa36a258f4c12c25f.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Fri,  4 Oct 2019 15:34:39 +0200	Err	parazyd.org	70
i	Err	parazyd.org	70
iAdd a flag in dam-client for a dynamic portmap.	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M cmd/dam-client/main.go              |       4 ++++	Err	parazyd.org	70
i  M pkg/damlib/config.go                |       2 +-	Err	parazyd.org	70
i	Err	parazyd.org	70
i2 files changed, 5 insertions(+), 1 deletion(-)	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@@ -51,6 +51,7 @@ var (	Err	parazyd.org	70
i         gen         = flag.Bool("gen", false, "Only (re)generate keypairs and exit cleanly.")	Err	parazyd.org	70
i         annint      = flag.Int("ai", 5, "Announce interval (in minutes)")	Err	parazyd.org	70
i         remoteentry = flag.String("remoteentry", "https://dam.decodeproject.eu/dirs.txt", "Remote list of entrypoints. (comma-separated)")	Err	parazyd.org	70
i+        portmap     = flag.String("portmap", "13010:13010,13011:13011,5000:5000", "Map of ports forwarded to/from Tor.")	Err	parazyd.org	70
i )	Err	parazyd.org	70
i 	Err	parazyd.org	70
i func clientInit(gen bool) error {	Err	parazyd.org	70
it@@ -249,6 +250,9 @@ func main() {	Err	parazyd.org	70
i                 lib.CheckError(err)	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i 	Err	parazyd.org	70
i+        // Map it to the flag	Err	parazyd.org	70
i+        lib.TorPortMap = "80:49371," + *portmap	Err	parazyd.org	70
i+	Err	parazyd.org	70
i         log.Println("Starting up the hidden service.")	Err	parazyd.org	70
i         cmd := exec.Command("damhs.py", "-k", lib.PrivKeyPath, "-p", lib.TorPortMap)	Err	parazyd.org	70
i         defer cmd.Process.Kill()	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@@ -45,7 +45,7 @@ const ProxyAddr = "127.0.0.1:9050"	Err	parazyd.org	70
i 	Err	parazyd.org	70
i // TorPortMap is a comma-separated string holding the mapping of ports	Err	parazyd.org	70
i // to be opened by the Tor Hidden Service. Format is "remote:local".	Err	parazyd.org	70
i-const TorPortMap = "80:49371,13010:13010,13011:13011,5000:5000"	Err	parazyd.org	70
i+var TorPortMap = "80:49371,13010:13010,13011:13011,5000:5000"	Err	parazyd.org	70
i 	Err	parazyd.org	70
i // DirPort is the port where dam-dir will be listening.	Err	parazyd.org	70
i const DirPort = 49371	Err	parazyd.org	70
.