Import Upstream version 1.0.24
This commit is contained in:
Guus Sliepen
parent
413f90b815
commit
45b80e247e
45 changed files with 1342 additions and 341 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.14 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
|
@ -80,8 +80,10 @@ subdir = doc
|
|||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am texinfo.tex
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/attribute.m4 \
|
||||
$(top_srcdir)/m4/lzo.m4 $(top_srcdir)/m4/openssl.m4 \
|
||||
$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.ac
|
||||
$(top_srcdir)/m4/ax_check_compile_flag.m4 \
|
||||
$(top_srcdir)/m4/ax_check_link_flag.m4 $(top_srcdir)/m4/lzo.m4 \
|
||||
$(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/zlib.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,4 +1,4 @@
|
|||
.Dd 2010-01-16
|
||||
.Dd 2014-05-11
|
||||
.Dt TINC.CONF 5
|
||||
.\" Manual page created by:
|
||||
.\" Ivo Timmermans
|
||||
|
|
@ -416,7 +416,7 @@ and
|
|||
are available.
|
||||
.El
|
||||
.It Va ReplayWindow Li = Ar bytes Pq 16
|
||||
vhis 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.
|
||||
The window is a bitfield which tracks 1 packet per bit, so for example
|
||||
the default setting of 16 will track up to 128 packets in the window. In high
|
||||
bandwidth scenarios, setting this to a higher value can reduce packet loss from
|
||||
|
|
@ -428,7 +428,8 @@ traffic.
|
|||
When this option is enabled tinc will only use Subnet statements which are
|
||||
present in the host config files in the local
|
||||
.Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /hosts/
|
||||
directory.
|
||||
directory. Subnets learned via connections to other nodes and which are not
|
||||
present in the local host config files are ignored.
|
||||
.It Va TunnelServer Li = yes | no Po no Pc Bq experimental
|
||||
When this option is enabled tinc will no longer forward information between other tinc daemons,
|
||||
and will only allow connections with nodes for which host config files are present in the local
|
||||
|
|
@ -631,6 +632,8 @@ The top directory for configuration files.
|
|||
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc.conf
|
||||
The default name of the server configuration file for net
|
||||
.Ar NETNAME .
|
||||
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /conf.d/
|
||||
Optional directory from which any *.conf file will be loaded
|
||||
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /hosts/
|
||||
Host configuration files are kept in this directory.
|
||||
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc-up
|
||||
|
|
|
|||
115
doc/tinc.info
115
doc/tinc.info
|
|
@ -1,14 +1,14 @@
|
|||
This is tinc.info, produced by makeinfo version 5.1 from tinc.texi.
|
||||
This is tinc.info, produced by makeinfo version 5.2 from tinc.texi.
|
||||
|
||||
INFO-DIR-SECTION Networking tools
|
||||
START-INFO-DIR-ENTRY
|
||||
* tinc: (tinc). The tinc Manual.
|
||||
END-INFO-DIR-ENTRY
|
||||
|
||||
This is the info manual for tinc version 1.0.22, a Virtual Private
|
||||
This is the info manual for tinc version 1.0.23, a Virtual Private
|
||||
Network daemon.
|
||||
|
||||
Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen
|
||||
Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen
|
||||
<guus@tinc-vpn.org> and Wessel Dankers <wsl@tinc-vpn.org>.
|
||||
|
||||
Permission is granted to make and distribute verbatim copies of this
|
||||
|
|
@ -649,6 +649,9 @@ The actual configuration of the daemon is done in the file
|
|||
'/etc/tinc/NETNAME/tinc.conf' and at least one other file in the
|
||||
directory '/etc/tinc/NETNAME/hosts/'.
|
||||
|
||||
An optionnal directory '/etc/tinc/NETNAME/conf.d' can be added from
|
||||
which any .conf file will be read.
|
||||
|
||||
These file consists of comments (lines started with a #) or
|
||||
assignments in the form of
|
||||
|
||||
|
|
@ -1011,7 +1014,9 @@ ReplayWindow = <bytes> (16)
|
|||
StrictSubnets = <yes|no> (no) [experimental]
|
||||
When this option is enabled tinc will only use Subnet statements
|
||||
which are present in the host config files in the local
|
||||
'/etc/tinc/NETNAME/hosts/' directory.
|
||||
'/etc/tinc/NETNAME/hosts/' directory. Subnets learned via
|
||||
connections to other nodes and which are not present in the local
|
||||
host config files are ignored.
|
||||
|
||||
TunnelServer = <yes|no> (no) [experimental]
|
||||
When this option is enabled tinc will no longer forward information
|
||||
|
|
@ -1040,7 +1045,9 @@ Address = <IP ADDRESS|HOSTNAME> [<port>] [recommended]
|
|||
This variable is only required if you want to connect to this host.
|
||||
It must resolve to the external IP address where the host can be
|
||||
reached, not the one that is internal to the VPN. If no port is
|
||||
specified, the default Port is used.
|
||||
specified, the default Port is used. Multiple Address variables
|
||||
can be specified, in which case each address will be tried until a
|
||||
working connection has been established.
|
||||
|
||||
Cipher = <CIPHER> (blowfish)
|
||||
The symmetric cipher algorithm used to encrypt UDP packets. Any
|
||||
|
|
@ -2424,16 +2431,16 @@ Concept Index
|
|||
* CHAL_REPLY: Authentication protocol.
|
||||
(line 10)
|
||||
* CIDR notation: Host configuration variables.
|
||||
(line 91)
|
||||
(line 93)
|
||||
* Cipher: Host configuration variables.
|
||||
(line 12)
|
||||
(line 14)
|
||||
* ClampMSS: Host configuration variables.
|
||||
(line 18)
|
||||
(line 20)
|
||||
* client: How connections work.
|
||||
(line 18)
|
||||
* command line: Runtime options. (line 9)
|
||||
* Compression: Host configuration variables.
|
||||
(line 24)
|
||||
(line 26)
|
||||
* connection: The connection. (line 6)
|
||||
* ConnectTo: Main configuration variables.
|
||||
(line 53)
|
||||
|
|
@ -2452,7 +2459,7 @@ Concept Index
|
|||
* DeviceType: Main configuration variables.
|
||||
(line 80)
|
||||
* Digest: Host configuration variables.
|
||||
(line 29)
|
||||
(line 31)
|
||||
* DirectOnly: Main configuration variables.
|
||||
(line 145)
|
||||
* dummy: Main configuration variables.
|
||||
|
|
@ -2481,7 +2488,7 @@ Concept Index
|
|||
* IffOneQueue: Main configuration variables.
|
||||
(line 191)
|
||||
* IndirectData: Host configuration variables.
|
||||
(line 34)
|
||||
(line 36)
|
||||
* Interface: Main configuration variables.
|
||||
(line 194)
|
||||
* INTERFACE: Scripts. (line 56)
|
||||
|
|
@ -2498,7 +2505,7 @@ Concept Index
|
|||
* MACExpire: Main configuration variables.
|
||||
(line 219)
|
||||
* MACLength: Host configuration variables.
|
||||
(line 42)
|
||||
(line 44)
|
||||
* MaxTimeout: Main configuration variables.
|
||||
(line 224)
|
||||
* meta-protocol: The meta-connection. (line 18)
|
||||
|
|
@ -2521,7 +2528,7 @@ Concept Index
|
|||
* OpenSSL: OpenSSL. (line 6)
|
||||
* options: Runtime options. (line 9)
|
||||
* PEM format: Host configuration variables.
|
||||
(line 67)
|
||||
(line 69)
|
||||
* PING: The meta-protocol. (line 88)
|
||||
* PingInterval: Main configuration variables.
|
||||
(line 266)
|
||||
|
|
@ -2529,12 +2536,12 @@ Concept Index
|
|||
(line 270)
|
||||
* platforms: Supported platforms. (line 6)
|
||||
* PMTU: Host configuration variables.
|
||||
(line 47)
|
||||
(line 49)
|
||||
* PMTUDiscovery: Host configuration variables.
|
||||
(line 50)
|
||||
(line 52)
|
||||
* PONG: The meta-protocol. (line 88)
|
||||
* Port: Host configuration variables.
|
||||
(line 55)
|
||||
(line 57)
|
||||
* port numbers: Other files. (line 17)
|
||||
* PriorityInheritance: Main configuration variables.
|
||||
(line 276)
|
||||
|
|
@ -2549,9 +2556,9 @@ Concept Index
|
|||
* Proxy: Main configuration variables.
|
||||
(line 297)
|
||||
* PublicKey: Host configuration variables.
|
||||
(line 59)
|
||||
(line 61)
|
||||
* PublicKeyFile: Host configuration variables.
|
||||
(line 62)
|
||||
(line 64)
|
||||
* raw_socket: Main configuration variables.
|
||||
(line 92)
|
||||
* release: Supported platforms. (line 14)
|
||||
|
|
@ -2576,16 +2583,16 @@ Concept Index
|
|||
* StrictSubnets: Main configuration variables.
|
||||
(line 331)
|
||||
* Subnet: Host configuration variables.
|
||||
(line 74)
|
||||
(line 76)
|
||||
* SUBNET: Scripts. (line 72)
|
||||
* Subnet weight: Host configuration variables.
|
||||
(line 96)
|
||||
(line 98)
|
||||
* SVPN: Security. (line 11)
|
||||
* switch: Main configuration variables.
|
||||
(line 239)
|
||||
* TCP: The meta-connection. (line 10)
|
||||
* TCPonly: Host configuration variables.
|
||||
(line 103)
|
||||
(line 105)
|
||||
* tinc: Introduction. (line 6)
|
||||
* TINC: Security. (line 6)
|
||||
* tinc-down: Scripts. (line 18)
|
||||
|
|
@ -2596,16 +2603,16 @@ Concept Index
|
|||
* tunifhead: Main configuration variables.
|
||||
(line 134)
|
||||
* TunnelServer: Main configuration variables.
|
||||
(line 336)
|
||||
(line 338)
|
||||
* tunnohead: Main configuration variables.
|
||||
(line 128)
|
||||
* UDP: The UDP tunnel. (line 30)
|
||||
* UDP <1>: Encryption of network packets.
|
||||
(line 12)
|
||||
* UDPRcvBuf: Main configuration variables.
|
||||
(line 343)
|
||||
(line 345)
|
||||
* UDPSndBuf: Main configuration variables.
|
||||
(line 348)
|
||||
(line 350)
|
||||
* UML: Main configuration variables.
|
||||
(line 110)
|
||||
* Universal tun/tap: Configuration of Linux kernels.
|
||||
|
|
@ -2656,35 +2663,35 @@ Node: Configuration introduction20366
|
|||
Node: Multiple networks21634
|
||||
Node: How connections work23059
|
||||
Node: Configuration files24281
|
||||
Node: Main configuration variables25669
|
||||
Node: Host configuration variables41635
|
||||
Node: Scripts46990
|
||||
Node: How to configure49753
|
||||
Node: Generating keypairs51010
|
||||
Node: Network interfaces51509
|
||||
Node: Example configuration53357
|
||||
Node: Running tinc58682
|
||||
Node: Runtime options59272
|
||||
Node: Signals62574
|
||||
Node: Debug levels63765
|
||||
Node: Solving problems64701
|
||||
Node: Error messages66253
|
||||
Node: Sending bug reports70262
|
||||
Node: Technical information71209
|
||||
Node: The connection71440
|
||||
Node: The UDP tunnel71752
|
||||
Node: The meta-connection74815
|
||||
Node: The meta-protocol76284
|
||||
Node: Security81301
|
||||
Node: Authentication protocol82434
|
||||
Node: Encryption of network packets87451
|
||||
Node: Security issues88827
|
||||
Node: Platform specific information90454
|
||||
Node: Interface configuration90682
|
||||
Node: Routes93135
|
||||
Node: About us95052
|
||||
Node: Contact information95227
|
||||
Node: Authors95631
|
||||
Node: Concept Index96036
|
||||
Node: Main configuration variables25776
|
||||
Node: Host configuration variables41870
|
||||
Node: Scripts47371
|
||||
Node: How to configure50134
|
||||
Node: Generating keypairs51391
|
||||
Node: Network interfaces51890
|
||||
Node: Example configuration53738
|
||||
Node: Running tinc59063
|
||||
Node: Runtime options59653
|
||||
Node: Signals62955
|
||||
Node: Debug levels64146
|
||||
Node: Solving problems65082
|
||||
Node: Error messages66634
|
||||
Node: Sending bug reports70643
|
||||
Node: Technical information71590
|
||||
Node: The connection71821
|
||||
Node: The UDP tunnel72133
|
||||
Node: The meta-connection75196
|
||||
Node: The meta-protocol76665
|
||||
Node: Security81682
|
||||
Node: Authentication protocol82815
|
||||
Node: Encryption of network packets87832
|
||||
Node: Security issues89208
|
||||
Node: Platform specific information90835
|
||||
Node: Interface configuration91063
|
||||
Node: Routes93516
|
||||
Node: About us95433
|
||||
Node: Contact information95608
|
||||
Node: Authors96012
|
||||
Node: Concept Index96417
|
||||
|
||||
End Tag Table
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
|
||||
|
||||
Copyright @copyright{} 1998-2013 Ivo Timmermans,
|
||||
Copyright @copyright{} 1998-2014 Ivo Timmermans,
|
||||
Guus Sliepen <guus@@tinc-vpn.org> and
|
||||
Wessel Dankers <wsl@@tinc-vpn.org>.
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ permission notice identical to this one.
|
|||
@vskip 0pt plus 1filll
|
||||
This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
|
||||
|
||||
Copyright @copyright{} 1998-2013 Ivo Timmermans,
|
||||
Copyright @copyright{} 1998-2014 Ivo Timmermans,
|
||||
Guus Sliepen <guus@@tinc-vpn.org> and
|
||||
Wessel Dankers <wsl@@tinc-vpn.org>.
|
||||
|
||||
|
|
@ -718,6 +718,9 @@ The actual configuration of the daemon is done in the file
|
|||
@file{@value{sysconfdir}/tinc/@var{netname}/tinc.conf} and at least one other file in the directory
|
||||
@file{@value{sysconfdir}/tinc/@var{netname}/hosts/}.
|
||||
|
||||
An optionnal directory @file{@value{sysconfdir}/tinc/@var{netname}/conf.d} can be added from which
|
||||
any .conf file will be read.
|
||||
|
||||
These file consists of comments (lines started with a #) or assignments
|
||||
in the form of
|
||||
|
||||
|
|
@ -1102,6 +1105,8 @@ traffic.
|
|||
When this option is enabled tinc will only use Subnet statements which are
|
||||
present in the host config files in the local
|
||||
@file{@value{sysconfdir}/tinc/@var{netname}/hosts/} directory.
|
||||
Subnets learned via connections to other nodes and which are not
|
||||
present in the local host config files are ignored.
|
||||
|
||||
@cindex TunnelServer
|
||||
@item TunnelServer = <yes|no> (no) [experimental]
|
||||
|
|
@ -1134,6 +1139,8 @@ This variable is only required if you want to connect to this host. It
|
|||
must resolve to the external IP address where the host can be reached,
|
||||
not the one that is internal to the VPN.
|
||||
If no port is specified, the default Port is used.
|
||||
Multiple Address variables can be specified, in which case each address will be
|
||||
tried until a working connection has been established.
|
||||
|
||||
@cindex Cipher
|
||||
@item Cipher = <@var{cipher}> (blowfish)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.Dd 2011-01-02
|
||||
.Dd 2014-05-11
|
||||
.Dt TINCD 8
|
||||
.\" Manual page created by:
|
||||
.\" Ivo Timmermans
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue