force setting of close idle time to at least minimum.

Makefile

@@ -93,7 +93,7 @@ gendoc: all
 	@cat USAGE.md
 
 docker-build:
-	docker build --build-arg user=$(eephttpd) --build-arg path=example/www -f Dockerfile -t eyedeekay/$(eephttpd) .
+	docker build --force-rm --no-cache --build-arg user=$(eephttpd) --build-arg path=example/www -f Dockerfile -t eyedeekay/$(eephttpd) .
 
 docker-volume:
 	docker run -i -t -d \
@@ -103,7 +103,7 @@ docker-volume:
 
 docker-run: docker-volume
 	docker rm -f eephttpd; true
-	docker run -i -t -d \
+	docker run -i -t \
 		--network $(network) \
 		--env samhost=$(samhost) \
 		--env samport=$(samport) \
@@ -127,6 +127,13 @@ docker-cmd:
 	@echo "### Run in docker" >> USAGE.md
 	@echo "" >> USAGE.md
 	@echo '```' >> USAGE.md
+	@echo "docker run -i -t -d \\"
+	@echo "    --name $(eephttpd)-volume \\"
+	@echo "    --volume $(eephttpd):/home/$(eephttpd)/ \\"
+	@echo "    eyedeekay/$(eephttpd)"
+	@echo '```' >> USAGE.md
+	@echo "" >> USAGE.md
+	@echo '```' >> USAGE.md
 	@echo "docker run -i -t -d --network $(network) \\" >> USAGE.md
 	@echo "    --env samhost=$(samhost) \\" >> USAGE.md
 	@echo "    --env samport=$(samport) \\" >> USAGE.md
@@ -135,7 +142,7 @@ docker-cmd:
 	@echo "    --hostname $(eephttpd) \\" >> USAGE.md
 	@echo "    --name $(eephttpd) \\" >> USAGE.md
 	@echo "    --restart always \\" >> USAGE.md
-	@echo "    --volume $(eephttpd):/home/$(eephttpd)/ \\" >> USAGE.md
+	@echo "    --volumes-from $(eephttpd)-volume \\" >> USAGE.md
 	@echo "    eyedeekay/$(eephttpd)" >> USAGE.md
 	@echo '```' >> USAGE.md
 

README.md.asc

@@ -181,12 +181,12 @@ It would be really awesome if I could make this run on Android. So I'll make
 that happen eventually.
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlt184QACgkQ11wDs5te
-FOGL5gf/RfA9mcZUm9jKg/o2YlpxUwRO5xbF7YPXLGizn0S850vSRVFixqvJ3sj9
-lStxR++HNdnfdoSmAz2rcBvm21at6+lh7bQHwwMuPo9tNI7FLNsen8djvk+iEb3E
-Cr1K38IBahF3j5tLQaxO/sKJ7kRwYWW6IGnSwhwkbn8kmKNUotAMGJdGOckoVa1Q
-OmedBVRaApVE0wqDKEmD7B7AP4jm4F/Pe6BDK89MLJ3oF0p0aIB0CXznieOou60B
-eT9UsRw0jKDwiyT9rmLYu+VAT6q21wBSr/ZFNlHMD7ENvP3EIzHl0mrDhvRxtl+p
-UN6sAB6BS9B31h6ft7YVLsEDZvjSCA==
-=l89n
+iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlt1+ZoACgkQ11wDs5te
+FOH4oAf/Z9WekODcPCs9ReKR3rcHtPZf5PyKGeMmQEb9AzFRHmAFxwaVoc/BVNHJ
+JXBnzZMQJDr/ymIXVczkjklXeIcgMHAqWigK05FHsgsQR/JvuQKRtVfz5HT8X1qb
+cqRqAHlMcL9QzK+s4u6Fkbza57wsVfjKOwE8jGlGoK483BOidljIdv8OBsgFIzxg
+LjHPyAWSAbOg8nYKBQi9VdYsoOdloY0+MsfPh83rqhGeDLtPTXYEO25rEbRj+7u7
+CqdriSVIEl8ljEQm7kQrRMCxAhdirzl8Ij8cCrz0srvfMkvEiJuiMf8E25D7tSeX
++VPO6NvCuIWVIYCaTdCMpyGLnAuEog==
+=uWi3
 -----END PGP SIGNATURE-----

USAGE.md

@@ -120,7 +120,7 @@ Usage of ./bin/eephttpd:
   -rc int
     	Reduce idle tunnel quantity to X (0 to 5) (default 3)
   -rt int
-    	Reduce tunnel quantity after X (minutes) (default 10)
+    	Reduce tunnel quantity after X (milliseconds) (default 600000)
   -s string
     	the directory to save the keys in(default ./) (default ".")
   -sh string
@@ -138,6 +138,9 @@ docker build --build-arg user=eephttpd  --build-arg path=example/www -f Dockerfi
 
 ### Run in docker
 
+```
+```
+
 ```
 docker run -i -t -d --network si \
     --env samhost=sam-host \
@@ -147,7 +150,7 @@ docker run -i -t -d --network si \
     --hostname eephttpd \
     --name eephttpd \
     --restart always \
-    --volume eephttpd:/home/eephttpd/ \
+    --volumes-from eephttpd-volume \
     eyedeekay/eephttpd
 ```
 

etc/eephttpd/eephttpd.conf

@@ -12,5 +12,6 @@ outbound.quantity = 8
 gzip = true
 i2cp.reduceOnIdle = true
 i2cp.reduceIdleTime = 900000
+i2cp.closeIdleTime = 900000
 i2cp.reduceQuantity = 4
 keys = eephttpd

example/serve.go

@@ -90,8 +90,8 @@ func main() {
 			samforwarder.SetAllowZeroOut(*allowZeroHop),
 			samforwarder.SetCompress(*useCompression),
 			samforwarder.SetReduceIdle(*reduceIdle),
-			samforwarder.SetReduceIdleTime(*reduceIdleTime),
-            samforwarder.SetCloseIdleTime(*reduceIdleTime),
+			samforwarder.SetReduceIdleTimeMs(*reduceIdleTime),
+            samforwarder.SetCloseIdleTimeMs(*reduceIdleTime),
 			samforwarder.SetReduceIdleQuantity(*reduceIdleQuantity),
 		)
 	}

forwarder-client-options.go

@@ -237,6 +237,7 @@ func SetClientReduceIdle(b bool) func(*SAMClientForwarder) error {
 //SetClientReduceIdleTime sets the time to wait before reducing tunnels to idle levels
 func SetClientReduceIdleTime(u int) func(*SAMClientForwarder) error {
 	return func(c *SAMClientForwarder) error {
+        c.reduceIdleTime = 300000
 		if u >= 6 {
 			c.reduceIdleTime = strconv.Itoa((u * 60) * 1000)
 			return nil
@@ -248,6 +249,7 @@ func SetClientReduceIdleTime(u int) func(*SAMClientForwarder) error {
 //SetClientReduceIdleTimeMs sets the time to wait before reducing tunnels to idle levels in milliseconds
 func SetClientReduceIdleTimeMs(u int) func(*SAMClientForwarder) error {
 	return func(c *SAMClientForwarder) error {
+        c.reduceIdleTime = 300000
 		if u >= 300000 {
 			c.reduceIdleTime = strconv.Itoa(u)
 			return nil
@@ -282,6 +284,7 @@ func SetClientCloseIdle(b bool) func(*SAMClientForwarder) error {
 //SetClientCloseIdleTime sets the time to wait before closing tunnels to idle levels
 func SetClientCloseIdleTime(u int) func(*SAMClientForwarder) error {
 	return func(c *SAMClientForwarder) error {
+        c.closeIdleTime = 300000
 		if u >= 6 {
 			c.closeIdleTime = strconv.Itoa((u * 60) * 1000)
 			return nil
@@ -293,6 +296,7 @@ func SetClientCloseIdleTime(u int) func(*SAMClientForwarder) error {
 //SetClientCloseIdleTimeMs sets the time to wait before closing tunnels to idle levels in milliseconds
 func SetClientCloseIdleTimeMs(u int) func(*SAMClientForwarder) error {
 	return func(c *SAMClientForwarder) error {
+        c.closeIdleTime = 300000
 		if u >= 300000 {
 			c.closeIdleTime = strconv.Itoa(u)
 			return nil

forwarder-client.go

@@ -190,10 +190,10 @@ func NewSAMClientForwarderFromOptions(opts ...func(*SAMClientForwarder) error) (
 	s.encryptLeaseSet = "false"
 	s.useCompression = "true"
 	s.reduceIdle = "false"
-	s.reduceIdleTime = "15"
+	s.reduceIdleTime = "300000"
 	s.reduceIdleQuantity = "4"
 	s.closeIdle = "false"
-	s.closeIdleTime = "30"
+	s.closeIdleTime = "300000"
 	s.dest = "none"
 	for _, o := range opts {
 		if err := o(&s); err != nil {

forwarder-options.go

@@ -229,6 +229,7 @@ func SetReduceIdle(b bool) func(*SAMForwarder) error {
 //SetReduceIdleTime sets the time to wait before reducing tunnels to idle levels
 func SetReduceIdleTime(u int) func(*SAMForwarder) error {
 	return func(c *SAMForwarder) error {
+        c.reduceIdleTime = 300000
 		if u >= 6 {
 			c.reduceIdleTime = strconv.Itoa((u * 60) * 1000)
 			return nil
@@ -240,6 +241,7 @@ func SetReduceIdleTime(u int) func(*SAMForwarder) error {
 //SetReduceIdleTimeMs sets the time to wait before reducing tunnels to idle levels in milliseconds
 func SetReduceIdleTimeMs(u int) func(*SAMForwarder) error {
 	return func(c *SAMForwarder) error {
+        c.reduceIdleTime = 300000
 		if u >= 300000 {
 			c.reduceIdleTime = strconv.Itoa(u)
 			return nil
@@ -274,6 +276,7 @@ func SetCloseIdle(b bool) func(*SAMForwarder) error {
 //SetCloseIdleTime sets the time to wait before closing tunnels to idle levels
 func SetCloseIdleTime(u int) func(*SAMForwarder) error {
 	return func(c *SAMForwarder) error {
+        c.closeIdleTime = 300000
 		if u >= 6 {
 			c.closeIdleTime = strconv.Itoa((u * 60) * 1000)
 			return nil
@@ -285,6 +288,7 @@ func SetCloseIdleTime(u int) func(*SAMForwarder) error {
 //SetCloseIdleTimeMs sets the time to wait before closing tunnels to idle levels in milliseconds
 func SetCloseIdleTimeMs(u int) func(*SAMForwarder) error {
 	return func(c *SAMForwarder) error {
+        c.closeIdleTime = 300000
 		if u >= 300000 {
 			c.closeIdleTime = strconv.Itoa(u)
 			return nil

forwarder.go

@@ -195,7 +195,7 @@ func NewSAMForwarderFromOptions(opts ...func(*SAMForwarder) error) (*SAMForwarde
 	s.reduceIdleTime = "15"
 	s.reduceIdleQuantity = "4"
 	s.closeIdle = "false"
-	s.closeIdleTime = "30"
+	s.closeIdleTime = "300000"
 	for _, o := range opts {
 		if err := o(&s); err != nil {
 			return nil, err