idk/sam-forwarder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

force setting of close idle time to at least minimum.

Browse Source
This commit is contained in:
idk
2018-08-16 18:24:31 -04:00
parent 5ebba57c6e
commit c79df03cc5
9 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@@ -93,7 +93,7 @@ gendoc: all
@cat USAGE.md @cat USAGE.md
docker-build: 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-volume:
docker run -i -t -d \ docker run -i -t -d \
@@ -103,7 +103,7 @@ docker-volume:
docker-run: docker-volume docker-run: docker-volume
docker rm -f eephttpd; true docker rm -f eephttpd; true
docker run -i -t -d \ docker run -i -t \
--network $(network) \ --network $(network) \
--env samhost=$(samhost) \ --env samhost=$(samhost) \
--env samport=$(samport) \ --env samport=$(samport) \
@@ -127,6 +127,13 @@ docker-cmd:
@echo "### Run in docker" >> USAGE.md @echo "### Run in docker" >> USAGE.md
@echo "" >> USAGE.md @echo "" >> 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 "docker run -i -t -d --network $(network) \\" >> USAGE.md
@echo " --env samhost=$(samhost) \\" >> USAGE.md @echo " --env samhost=$(samhost) \\" >> USAGE.md
@echo " --env samport=$(samport) \\" >> USAGE.md @echo " --env samport=$(samport) \\" >> USAGE.md
@@ -135,7 +142,7 @@ docker-cmd:
@echo " --hostname $(eephttpd) \\" >> USAGE.md @echo " --hostname $(eephttpd) \\" >> USAGE.md
@echo " --name $(eephttpd) \\" >> USAGE.md @echo " --name $(eephttpd) \\" >> USAGE.md
@echo " --restart always \\" >> 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 " eyedeekay/$(eephttpd)" >> USAGE.md
@echo '```' >> USAGE.md @echo '```' >> USAGE.md

16
README.md.asc
View File

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

7
USAGE.md
View File

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

1
etc/eephttpd/eephttpd.conf
View File

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

4
example/serve.go
View File

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

4
forwarder-client-options.go
View File

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

4
forwarder-client.go
View File

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

4
forwarder-options.go
View File

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

2
forwarder.go
View File

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