j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Document new proxy types.

Browse source
This commit is contained in:
Guus Sliepen 2012-04-19 15:56:08 +02:00
parent 5ae19cb0bb
commit 5c0dd104f9
2 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
doc/tinc.conf.5.in
View file

@ -456,24 +456,38 @@ specified in the configuration file.
When this option is used the priority of the tincd process will be adjusted. When this option is used the priority of the tincd process will be adjusted.
Increasing the priority may help to reduce latency and packet loss on the VPN. Increasing the priority may help to reduce latency and packet loss on the VPN.
.It Va Proxy Li = Ar type Ar address Ar port Oo Ar username Oc Bq experimental .It Va Proxy Li = socks4 | socks5 | http | exec Ar ... Bq experimental
Use the proxy at the given Use a proxy when making outgoing connections.
.Ar address
and
.Ar port
when making outgoing connections.
The following proxy types are currently supported: The following proxy types are currently supported:
.Bl -tag -width indent .Bl -tag -width indent
.It socks4 .It socks4 Ar address Ar port Op Ar username
Connects to the proxy using the SOCKS version 4 protocol. Connects to the proxy using the SOCKS version 4 protocol.
Optionally, a Optionally, a
.Ar username .Ar username
can be supplied which will be passed on to the proxy server. can be supplied which will be passed on to the proxy server.
Only IPv4 connections can be proxied using SOCKS 4.
.It http .It socks5 Ar address Ar port Op Ar username Ar password
Connect to the proxy using the SOCKS version 5 protocol.
If a
.Ar username
and
.Ar password
are given, basic username/password authentication will be used,
otherwise no authentication will be used.
.It http Ar address Ar port
Connects to the proxy and sends a HTTP CONNECT request. Connects to the proxy and sends a HTTP CONNECT request.
.It exec Ar command
Executes the given
.Ar command
which should set up the outgoing connection.
The environment variables
.Ev NAME ,
.Ev NODE ,
.Ev REMOTEADDRES
and
.Ev REMOTEPORT
are available.
.El .El
No authentication methods are currently supported.
.It Va ReplayWindow Li = Ar bytes Pq 16 .It Va ReplayWindow Li = Ar bytes Pq 16
vhis is the size of the replay tracking window for each remote node, in bytes. vhis is the size of the replay tracking window for each remote node, in bytes.

22
doc/tinc.texi
View file

@ -1051,24 +1051,32 @@ When this option is used the priority of the tincd process will be adjusted.
Increasing the priority may help to reduce latency and packet loss on the VPN. Increasing the priority may help to reduce latency and packet loss on the VPN.
@cindex Proxy @cindex Proxy
@item Proxy = <@var{type}> <@var{address}> <@var{port}> [<@var{username}>] [experimental] @item Proxy = socks4 | socks4 | http | exec @var{...} [experimental]
Use the proxy at the given @var{address} and @var{port} when making outgoing connections. Use a proxy when making outgoing connections.
The following proxy types are currently supported: The following proxy types are currently supported:
@table @asis @table @asis
@cindex socks4 @cindex socks4
@item socks4 @item socks4 <@var{address}> <@var{port}> [<@var{username}>]
Connects to the proxy using the SOCKS version 4 protocol. Connects to the proxy using the SOCKS version 4 protocol.
Optionally, a @var{username} can be supplied which will be passed on to the proxy server. Optionally, a @var{username} can be supplied which will be passed on to the proxy server.
@cindex socks5
@item socks4 <@var{address}> <@var{port}> [<@var{username}> <@var{password}>]
Connect to the proxy using the SOCKS version 5 protocol.
If a @var{username} and @var{password} are given, basic username/password authentication will be used,
otherwise no authentication will be used.
@cindex http @cindex http
@item http @item http <@var{address}> <@var{port}>
Connects to the proxy and sends a HTTP CONNECT request. Connects to the proxy and sends a HTTP CONNECT request.
@cindex exec
@item exec <@var{command}>
Executes the given command which should set up the outgoing connection.
The environment variables @env{NAME}, @env{NODE}, @env{REMOTEADDRES} and @env{REMOTEPORT} are available.
@end table @end table
No authentication methods are currently supported.
@cindex ReplayWindow @cindex ReplayWindow
@item ReplayWindow = <bytes> (16) @item ReplayWindow = <bytes> (16)
This is the size of the replay tracking window for each remote node, in bytes. This is the size of the replay tracking window for each remote node, in bytes.