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

new clients are better

Browse Source
This commit is contained in:
idk
2018-09-19 19:41:32 -04:00
parent f7dc34ab34
commit 930652f52a
7 changed files with 162 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
README.md.asc
View File

@ -81,12 +81,12 @@ I'm eventually going to make the manager implement net.Conn. This won't be
exposed in the default application probably though, but rather as a library.
-----BEGIN PGP SIGNATURE-----
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlui104ACgkQ11wDs5te
FOEhcAgAg4JN04kpX9cUBP5CdWkHUjl5noXjK2vQ3+kG0wszne776p3DxFTk1EZe
EThImOzTBxty4+I9kJ4tjtoHkyGkh2rua9wtD/HKsW3u0G6k0aoi9peCM4Pttbn8
+8c6pE4UWZoie+ZwAuzwpRrj0vdpks2o4YFE4bz+wP9zn8yCACBEzHcEC18IA3O6
DivJVVkKI1Hwh0UtErmHqicAc7aCt//v3PDCkzSshD8hJ4RtRYLiBYXg3/vJj8vq
78SfvD5ggfZfsMP51EjG/zPbRzsT/q0KX0Dh19JSeHHEXOuaPBxUBHLrc0pUQK78
0MYB9pVLUPQExYIAu/K3jwFWC8Em2A==
=O6K8
iQEzBAEBCAAdFiEEcNIGBzi++AUjrK/311wDs5teFOEFAlui3qwACgkQ11wDs5te
FOFRzgf+Pv/8jMerpLXNBxKvFvkKWoR2e5U2q/4uLoFn6cKWpfjCnLpd6LzFKbdq
69mrnuNvbisMe1RGUDAN2tHdQaw5/ea+JfNtut+yjZ8QCIXjQAg3ObL8AlAxh9sW
7DubuXAfgsjMlM+xqj5z9VIe94HVwHJMbMufTJICrEHkEazalodtj3qnvpWoTGKA
eq5LNhukPHEM/THsHhfRbeXFcR3y72kjjUeKjDnp9alA8gb4HWvv380oXzgf6QEo
IGD+AAjccdAJ5YW+BmkM4YW4sGPZ3ByeHIQx+6N/k1EGGWgUtr7uNHWLEituyerk
Ek7dWEiX3DoAbEaqSlkwq1cwHLZKKg==
=1EWe
-----END PGP SIGNATURE-----

68
USAGE.md
View File

@ -103,6 +103,8 @@ Usage of ./bin/samcatd:
Reduce tunnel quantity after X (milliseconds) (default 600000)
-d string
Directory to save tunnel configuration file in.
-de string
Destination to connect client's to by default.
-f string
Use an ini file for configuration(config file options override passed arguments for now.) (default "none")
-h string
@ -189,10 +191,12 @@ does not start tunnels based on unlabeled options unless passed the
``` ini
## Defaults, these are only invoked with the -start option or if labeled tunnels
## are not present(samcatd instructions)
## are not present(samcatd instructions). **THESE** are the correct config files
## to use as defaults, and not the ones in ../sam-forwarder/tunnels.ini, which
## are used for testing settings availability only.
inbound.length = 3
outbound.length = 6
outbound.length = 3
inbound.lengthVariance = 0
outbound.lengthVariance = 0
inbound.backupQuantity = 3
@ -210,44 +214,46 @@ i2cp.enableWhiteList = false
i2cp.enableBlackList = false
keyfile = "/usr/share/samcatd/samcatd"
[sam-forwarder]
type = server
host = 127.0.0.1
port = 8081
inbound.length = 3
outbound.length = 6
keys = forwarder
#[sam-forwarder]
#type = server
#host = 127.0.0.1
#port = 8081
#inbound.length = 3
#outbound.length = 3
#keys = forwarder
[sam-forwarder-two]
type = client
host = 127.0.0.1
port = 8082
inbound.length = 6
inbound.length = 3
outbound.length = 3
destination = i2p-projekt.i2p
keys = forwarder-two
[sam-forwarder-three]
type = udpclient
host = 127.0.0.1
port = 8083
inbound.length = 3
outbound.length = 6
keys = forwarder-three
#[sam-forwarder-three]
#type = udpclient
#host = 127.0.0.1
#port = 8083
#inbound.length = 3
#outbound.length = 3
#destination = i2p-projekt.i2p
#keys = forwarder-three
[sam-forwarder-four]
type = udpserver
host = 127.0.0.1
port = 8084
inbound.length = 6
outbound.length = 3
keys = forwarder-four
#[sam-forwarder-four]
#type = udpserver
#host = 127.0.0.1
#port = 8084
#inbound.length = 6
#outbound.length = 3
#keys = forwarder-four
[sam-forwarder-five]
type = http
host = 127.0.0.1
port = 8085
inbound.length = 3
outbound.length = 6
keys = forwarder-five
#[sam-forwarder-five]
#type = http
#host = 127.0.0.1
#port = 8085
#inbound.length = 3
#outbound.length = 3
#keys = forwarder-five
```

6
daemon/main.go
View File

@ -64,6 +64,10 @@ var (
"Start web administration interface")
webPort = flag.String("wp", "7957",
"Web port")
webCSS = flag.String("css", "css/styles.css",
"custom CSS for web interface")
webJS = flag.String("js", "js/scripts.js",
"custom JS for web interface")
leaseSetKey = flag.String("k", "none",
"key for encrypted leaseset")
leaseSetPrivateKey = flag.String("pk", "none",
@ -178,7 +182,7 @@ func main() {
*startUp,
); err == nil {
if *webAdmin {
go samcatweb.Serve(manager, manager.WebHost, manager.WebPort)
go samcatweb.Serve(manager, "", "", manager.WebHost, manager.WebPort)
}
manager.Serve()
} else {

68
docs/USAGE.md
View File

@ -103,6 +103,8 @@ Usage of ./bin/samcatd:
Reduce tunnel quantity after X (milliseconds) (default 600000)
-d string
Directory to save tunnel configuration file in.
-de string
Destination to connect client's to by default.
-f string
Use an ini file for configuration(config file options override passed arguments for now.) (default "none")
-h string
@ -189,10 +191,12 @@ does not start tunnels based on unlabeled options unless passed the
``` ini
## Defaults, these are only invoked with the -start option or if labeled tunnels
## are not present(samcatd instructions)
## are not present(samcatd instructions). **THESE** are the correct config files
## to use as defaults, and not the ones in ../sam-forwarder/tunnels.ini, which
## are used for testing settings availability only.
inbound.length = 3
outbound.length = 6
outbound.length = 3
inbound.lengthVariance = 0
outbound.lengthVariance = 0
inbound.backupQuantity = 3
@ -210,44 +214,46 @@ i2cp.enableWhiteList = false
i2cp.enableBlackList = false
keyfile = "/usr/share/samcatd/samcatd"
[sam-forwarder]
type = server
host = 127.0.0.1
port = 8081
inbound.length = 3
outbound.length = 6
keys = forwarder
#[sam-forwarder]
#type = server
#host = 127.0.0.1
#port = 8081
#inbound.length = 3
#outbound.length = 3
#keys = forwarder
[sam-forwarder-two]
type = client
host = 127.0.0.1
port = 8082
inbound.length = 6
inbound.length = 3
outbound.length = 3
destination = i2p-projekt.i2p
keys = forwarder-two
[sam-forwarder-three]
type = udpclient
host = 127.0.0.1
port = 8083
inbound.length = 3
outbound.length = 6
keys = forwarder-three
#[sam-forwarder-three]
#type = udpclient
#host = 127.0.0.1
#port = 8083
#inbound.length = 3
#outbound.length = 3
#destination = i2p-projekt.i2p
#keys = forwarder-three
[sam-forwarder-four]
type = udpserver
host = 127.0.0.1
port = 8084
inbound.length = 6
outbound.length = 3
keys = forwarder-four
#[sam-forwarder-four]
#type = udpserver
#host = 127.0.0.1
#port = 8084
#inbound.length = 6
#outbound.length = 3
#keys = forwarder-four
[sam-forwarder-five]
type = http
host = 127.0.0.1
port = 8085
inbound.length = 3
outbound.length = 6
keys = forwarder-five
#[sam-forwarder-five]
#type = http
#host = 127.0.0.1
#port = 8085
#inbound.length = 3
#outbound.length = 3
#keys = forwarder-five
```

1
docs/config/CHECKLIST.md
View File

@ -97,6 +97,7 @@ key:
[U] - i2p.streaming.tcbcache.wdwDampening 0.75 Ref: RFC 2140. Floating point value. May be set only via context properties, not connection options. As of release 0.9.8.
[U] - i2p.streaming.writeTimeout -1 How long to block on write/flush, in milliseconds. Negative means indefinitely.
[C] - destination useful to consider adding to custom applications for client ocnfiguration
\* : I'd like to have something like this setting internal to samcatd, but it
might not always be relevant to pass it through to the real i2p router. Right

68
docs/index.html
View File

@ -84,6 +84,8 @@ Usage of ./bin/samcatd:
Reduce tunnel quantity after X (milliseconds) (default 600000)
-d string
Directory to save tunnel configuration file in.
-de string
Destination to connect client's to by default.
-f string
Use an ini file for configuration(config file options override passed arguments for now.) (default "none")
-h string
@ -150,10 +152,12 @@ Usage of ./bin/samcatd:
<p>(<strong>samcatd</strong> treats the first set of options it sees as the default, and does not start tunnels based on unlabeled options unless passed the -s flag.)</p>
<div class="sourceCode"><pre class="sourceCode ini"><code class="sourceCode ini">
<span class="co">## Defaults, these are only invoked with the -start option or if labeled tunnels</span>
<span class="co">## are not present(samcatd instructions)</span>
<span class="co">## are not present(samcatd instructions). **THESE** are the correct config files</span>
<span class="co">## to use as defaults, and not the ones in ../sam-forwarder/tunnels.ini, which</span>
<span class="co">## are used for testing settings availability only.</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">inbound.lengthVariance </span><span class="ot">=</span><span class="st"> </span><span class="dv">0</span>
<span class="dt">outbound.lengthVariance </span><span class="ot">=</span><span class="st"> </span><span class="dv">0</span>
<span class="dt">inbound.backupQuantity </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
@ -171,42 +175,44 @@ Usage of ./bin/samcatd:
<span class="dt">i2cp.enableBlackList </span><span class="ot">=</span><span class="st"> </span><span class="kw">false</span>
<span class="dt">keyfile </span><span class="ot">=</span><span class="st"> &quot;/usr/share/samcatd/samcatd&quot;</span>
<span class="kw">[sam-forwarder]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> server</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8081</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder</span>
<span class="co">#[sam-forwarder]</span>
<span class="co">#type = server</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8081</span>
<span class="co">#inbound.length = 3</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#keys = forwarder</span>
<span class="kw">[sam-forwarder-two]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> client</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8082</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">destination </span><span class="ot">=</span><span class="st"> i2p-projekt.i2p</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-two</span>
<span class="kw">[sam-forwarder-three]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> udpclient</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8083</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-three</span>
<span class="co">#[sam-forwarder-three]</span>
<span class="co">#type = udpclient</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8083</span>
<span class="co">#inbound.length = 3</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#destination = i2p-projekt.i2p</span>
<span class="co">#keys = forwarder-three</span>
<span class="kw">[sam-forwarder-four]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> udpserver</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8084</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-four</span>
<span class="co">#[sam-forwarder-four]</span>
<span class="co">#type = udpserver</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8084</span>
<span class="co">#inbound.length = 6</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#keys = forwarder-four</span>
<span class="kw">[sam-forwarder-five]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> http</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8085</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-five</span></code></pre></div>
<span class="co">#[sam-forwarder-five]</span>
<span class="co">#type = http</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8085</span>
<span class="co">#inbound.length = 3</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#keys = forwarder-five</span></code></pre></div>

68
example/www/index.html
View File

@ -84,6 +84,8 @@ Usage of ./bin/samcatd:
Reduce tunnel quantity after X (milliseconds) (default 600000)
-d string
Directory to save tunnel configuration file in.
-de string
Destination to connect client&#39;s to by default.
-f string
Use an ini file for configuration(config file options override passed arguments for now.) (default &quot;none&quot;)
-h string
@ -150,10 +152,12 @@ Usage of ./bin/samcatd:
<p>(<strong>samcatd</strong> treats the first set of options it sees as the default, and does not start tunnels based on unlabeled options unless passed the -s flag.)</p>
<div class="sourceCode"><pre class="sourceCode ini"><code class="sourceCode ini">
<span class="co">## Defaults, these are only invoked with the -start option or if labeled tunnels</span>
<span class="co">## are not present(samcatd instructions)</span>
<span class="co">## are not present(samcatd instructions). **THESE** are the correct config files</span>
<span class="co">## to use as defaults, and not the ones in ../sam-forwarder/tunnels.ini, which</span>
<span class="co">## are used for testing settings availability only.</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">inbound.lengthVariance </span><span class="ot">=</span><span class="st"> </span><span class="dv">0</span>
<span class="dt">outbound.lengthVariance </span><span class="ot">=</span><span class="st"> </span><span class="dv">0</span>
<span class="dt">inbound.backupQuantity </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
@ -171,42 +175,44 @@ Usage of ./bin/samcatd:
<span class="dt">i2cp.enableBlackList </span><span class="ot">=</span><span class="st"> </span><span class="kw">false</span>
<span class="dt">keyfile </span><span class="ot">=</span><span class="st"> &quot;/usr/share/samcatd/samcatd&quot;</span>
<span class="kw">[sam-forwarder]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> server</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8081</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder</span>
<span class="co">#[sam-forwarder]</span>
<span class="co">#type = server</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8081</span>
<span class="co">#inbound.length = 3</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#keys = forwarder</span>
<span class="kw">[sam-forwarder-two]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> client</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8082</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">destination </span><span class="ot">=</span><span class="st"> i2p-projekt.i2p</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-two</span>
<span class="kw">[sam-forwarder-three]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> udpclient</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8083</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-three</span>
<span class="co">#[sam-forwarder-three]</span>
<span class="co">#type = udpclient</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8083</span>
<span class="co">#inbound.length = 3</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#destination = i2p-projekt.i2p</span>
<span class="co">#keys = forwarder-three</span>
<span class="kw">[sam-forwarder-four]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> udpserver</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8084</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-four</span>
<span class="co">#[sam-forwarder-four]</span>
<span class="co">#type = udpserver</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8084</span>
<span class="co">#inbound.length = 6</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#keys = forwarder-four</span>
<span class="kw">[sam-forwarder-five]</span>
<span class="dt">type </span><span class="ot">=</span><span class="st"> http</span>
<span class="dt">host </span><span class="ot">=</span><span class="st"> </span><span class="fl">127.0.0.1</span>
<span class="dt">port </span><span class="ot">=</span><span class="st"> </span><span class="dv">8085</span>
<span class="dt">inbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">3</span>
<span class="dt">outbound.length </span><span class="ot">=</span><span class="st"> </span><span class="dv">6</span>
<span class="dt">keys </span><span class="ot">=</span><span class="st"> forwarder-five</span></code></pre></div>
<span class="co">#[sam-forwarder-five]</span>
<span class="co">#type = http</span>
<span class="co">#host = 127.0.0.1</span>
<span class="co">#port = 8085</span>
<span class="co">#inbound.length = 3</span>
<span class="co">#outbound.length = 3</span>
<span class="co">#keys = forwarder-five</span></code></pre></div>