Import Upstream version 1.1~pre9

This commit is contained in:
Guus Sliepen 2019-08-26 13:44:51 +02:00
parent f5c641f5cc
commit 60cff3039b
93 changed files with 2731 additions and 5437 deletions

View file

@ -6,7 +6,7 @@ man_MANS = tincd.8 tinc.8 tinc.conf.5 tinc-gui.8
EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.8.in tinc.conf.5.in tinc-gui.8.in sample-config.tar.gz
CLEANFILES = *.html tinc.info tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
CLEANFILES = *.html tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
# Use `ginstall' in the definition of man_MANS to avoid
# confusion with the `install' target. The install rule transforms `ginstall'
@ -19,9 +19,6 @@ transform = s/ginstall/install/; @program_transform_name@
sample-config.tar.gz: sample-config
GZIP=$(GZIP_ENV) $(AMTAR) chozf sample-config.tar.gz --exclude .svn sample-config
texi2html: tinc.texi
texi2html -split=chapter tinc.texi
tincd.8.html: tincd.8
w3mman2html $? > $@

View file

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.13.3 from Makefile.am.
# Makefile.in generated by automake 1.14 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@ -131,7 +131,7 @@ AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
am__v_texidevnull_0 = > /dev/null
am__v_texidevnull_1 =
INFO_DEPS = tinc.info
INFO_DEPS = $(srcdir)/tinc.info
am__TEXINFO_TEX_DIR = $(srcdir)
DVIS = tinc.dvi
PDFS = tinc.pdf
@ -293,7 +293,7 @@ top_srcdir = @top_srcdir@
info_TEXINFOS = tinc.texi
man_MANS = tincd.8 tinc.8 tinc.conf.5 tinc-gui.8
EXTRA_DIST = tincinclude.texi.in tincd.8.in tinc.8.in tinc.conf.5.in tinc-gui.8.in sample-config.tar.gz
CLEANFILES = *.html tinc.info tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
CLEANFILES = *.html tincd.8 tinc.8 tinc.conf.5 tinc-gui.8 tincinclude.texi
substitute = sed \
-e s,'@PACKAGE\@',"$(PACKAGE)",g \
-e s,'@VERSION\@',"$(VERSION)",g \
@ -303,7 +303,7 @@ substitute = sed \
all: all-am
.SUFFIXES:
.SUFFIXES: .dvi .ps
.SUFFIXES: .dvi .html .info .pdf .ps .texi
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@ -335,49 +335,53 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
tinc.info: tinc.texi
.texi.info:
$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
am__cwd=`pwd` && $(am__cd) $(srcdir) && \
rm -rf $$backupdir && mkdir $$backupdir && \
if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
done; \
else :; fi && \
cd "$$am__cwd"; \
if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $@ `test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi; \
-o $@ $<; \
then \
rc=0; \
$(am__cd) $(srcdir); \
else \
rc=$$?; \
$(am__cd) $(srcdir) && \
$$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
fi; \
rm -rf $$backupdir; exit $$rc
tinc.dvi: tinc.texi
.texi.dvi:
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
`test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi
$<
tinc.pdf: tinc.texi
.texi.pdf:
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
`test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi
$<
tinc.html: tinc.texi
.texi.html:
$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
-o $(@:.html=.htp) `test -f 'tinc.texi' || echo '$(srcdir)/'`tinc.texi; \
-o $(@:.html=.htp) $<; \
then \
rm -rf $@; \
if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
rm -rf $@ && mv $(@:.html=.htp) $@; \
else \
if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
exit 1; \
rm -rf $(@:.html=.htp); exit 1; \
fi
$(srcdir)/tinc.info: tinc.texi
tinc.dvi: tinc.texi
tinc.pdf: tinc.texi
tinc.html: tinc.texi
.dvi.ps:
$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
$(DVIPS) $(AM_V_texinfo) -o $@ $<
@ -820,9 +824,6 @@ uninstall-man: uninstall-man5 uninstall-man8
sample-config.tar.gz: sample-config
GZIP=$(GZIP_ENV) $(AMTAR) chozf sample-config.tar.gz --exclude .svn sample-config
texi2html: tinc.texi
texi2html -split=chapter tinc.texi
tincd.8.html: tincd.8
w3mman2html $? > $@

View file

@ -580,7 +580,9 @@ UDP is possible or not.
Apart from reading the server and host configuration files,
tinc can also run scripts at certain moments.
Under Windows (not Cygwin), the scripts should have the extension
.Pa .bat .
.Pa .bat
or
.Pa cmd .
.Bl -tag -width indent
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /tinc-up
This is the most important script.
@ -607,6 +609,10 @@ This script is started when a Subnet becomes reachable.
The Subnet and the node it belongs to are passed in environment variables.
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /subnet-down
This script is started when a Subnet becomes unreachable.
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /invitation-created
This script is started when a new invitation has been created.
.It Pa @sysconfdir@/tinc/ Ns Ar NETNAME Ns Pa /invitation-accepted
This script is started when an invitation has been used.
.El
.Pp
The scripts are started without command line arguments, but can make use of certain environment variables.
@ -615,6 +621,8 @@ Under UNIX like operating systems the names of environment variables must be pre
in scripts.
Under Windows, in
.Pa .bat
or
.Pa .cmd
files, they have to be put between
.Li %
signs.
@ -640,6 +648,14 @@ When a host becomes (un)reachable, this is set to the port number it uses for co
When a subnet becomes (un)reachable, this is set to the subnet.
.It Ev WEIGHT
When a subnet becomes (un)reachable, this is set to the subnet weight.
.It Ev INVITATION_FILE
When the
.Pa invitation-created
script is called, this is set to the file where the invitation details will be stored.
.It Ev INVITATION_URL
When the
.Pa invitation-created
script is called, this is set to the invitation URL that has been created.
.El
.Pp
Do not forget that under UNIX operating systems, you have to make the scripts executable, using the command

View file

@ -5,7 +5,7 @@ START-INFO-DIR-ENTRY
* tinc: (tinc). The tinc Manual.
END-INFO-DIR-ENTRY
This is the info manual for tinc version 1.1pre7, a Virtual Private
This is the info manual for tinc version 1.1pre9, a Virtual Private
Network daemon.
Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen
@ -1242,7 +1242,7 @@ File: tinc.info, Node: Scripts, Next: How to configure, Prev: Host configurat
Apart from reading the server and host configuration files, tinc can
also run scripts at certain moments. Under Windows (not Cygwin), the
scripts should have the extension .bat.
scripts should have the extension '.bat' or '.cmd'.
'/etc/tinc/NETNAME/tinc-up'
This is the most important script. If it is present it will be
@ -1276,10 +1276,17 @@ scripts should have the extension .bat.
'/etc/tinc/NETNAME/subnet-down'
This script is started when a Subnet becomes unreachable.
'/etc/tinc/NETNAME/invitation-created'
This script is started when a new invitation has been created.
'/etc/tinc/NETNAME/invitation-accepted'
This script is started when an invitation has been used.
The scripts are started without command line arguments, but can make use
of certain environment variables. Under UNIX like operating systems the
names of environment variables must be preceded by a $ in scripts.
Under Windows, in '.bat' files, they have to be put between % signs.
Under Windows, in '.bat' or '.cmd' files, they have to be put between %
signs.
'NETNAME'
If a netname was specified, this environment variable contains it.
@ -1309,6 +1316,21 @@ Under Windows, in '.bat' files, they have to be put between % signs.
'SUBNET'
When a subnet becomes (un)reachable, this is set to the subnet.
'WEIGHT'
When a subnet becomes (un)reachable, this is set to the subnet
weight.
'INVITATION_FILE'
When the 'invitation-created' script is called, this is set to the
file where the invitation details will be stored.
'INVITATION_URL'
When the 'invitation-created' script is called, this is set to the
invitation URL that has been created.
Do not forget that under UNIX operating systems, you have to make the
scripts executable, using the command 'chmod a+x script'.

File: tinc.info, Node: How to configure, Prev: Scripts, Up: Configuration files
@ -3043,7 +3065,7 @@ Concept Index
* DEL_SUBNET: The meta-protocol. (line 46)
* Device: Main configuration variables.
(line 80)
* DEVICE: Scripts. (line 53)
* DEVICE: Scripts. (line 60)
* device files: Device files. (line 6)
* DeviceType: Main configuration variables.
(line 87)
@ -3058,7 +3080,7 @@ Concept Index
* encapsulating: The UDP tunnel. (line 30)
* encryption: Encryption of network packets.
(line 6)
* environment variables: Scripts. (line 42)
* environment variables: Scripts. (line 48)
* example: Example configuration.
(line 6)
* exec: Main configuration variables.
@ -3080,7 +3102,9 @@ Concept Index
(line 38)
* Interface: Main configuration variables.
(line 201)
* INTERFACE: Scripts. (line 56)
* INTERFACE: Scripts. (line 63)
* INVITATION_FILE: Scripts. (line 86)
* INVITATION_URL: Scripts. (line 90)
* IRC: Contact information. (line 9)
* KeyExpire: Main configuration variables.
(line 251)
@ -3112,15 +3136,15 @@ Concept Index
* multiple networks: Multiple networks. (line 6)
* Name: Main configuration variables.
(line 268)
* NAME: Scripts. (line 50)
* NAME: Scripts. (line 57)
* netmask: Network interfaces. (line 39)
* netname: Multiple networks. (line 6)
* NETNAME: Scripts. (line 47)
* NETNAME: Scripts. (line 54)
* NETNAME <1>: tinc environment variables.
(line 6)
* Network Administrators Guide: Configuration introduction.
(line 15)
* NODE: Scripts. (line 60)
* NODE: Scripts. (line 67)
* OpenSSL: OpenSSL. (line 6)
* options: Runtime options. (line 9)
* PEM format: Host configuration variables.
@ -3158,8 +3182,8 @@ Concept Index
* raw_socket: Main configuration variables.
(line 99)
* release: Supported platforms. (line 14)
* REMOTEADDRESS: Scripts. (line 65)
* REMOTEPORT: Scripts. (line 68)
* REMOTEADDRESS: Scripts. (line 72)
* REMOTEPORT: Scripts. (line 75)
* ReplayWindow: Main configuration variables.
(line 333)
* requirements: Libraries. (line 6)
@ -3182,7 +3206,7 @@ Concept Index
(line 344)
* Subnet: Host configuration variables.
(line 77)
* SUBNET: Scripts. (line 72)
* SUBNET: Scripts. (line 79)
* SVPN: Security. (line 11)
* switch: Main configuration variables.
(line 235)
@ -3222,6 +3246,7 @@ Concept Index
(line 6)
* vpnd: tinc. (line 6)
* website: Contact information. (line 6)
* WEIGHT: Scripts. (line 82)
* zlib: zlib. (line 6)
@ -3263,38 +3288,38 @@ Node: Configuration files27607
Node: Main configuration variables29135
Node: Host configuration variables45893
Node: Scripts51364
Node: How to configure54033
Node: Network interfaces58509
Node: Example configuration60888
Node: Running tinc65981
Node: Runtime options66568
Node: Signals69428
Node: Debug levels70277
Node: Solving problems71213
Node: Error messages72639
Node: Sending bug reports76956
Node: Controlling tinc77903
Node: tinc runtime options78280
Node: tinc environment variables78967
Node: tinc commands79296
Node: tinc examples84406
Node: tinc top84969
Node: Technical information86554
Node: The connection86789
Node: The UDP tunnel87101
Node: The meta-connection90146
Node: The meta-protocol91604
Node: Security96587
Node: Legacy authentication protocol97924
Node: Simple Peer-to-Peer Security102541
Node: Encryption of network packets108201
Node: Security issues110830
Node: Platform specific information112565
Node: Interface configuration112793
Node: Routes115234
Node: About us117145
Node: Contact information117320
Node: Authors117722
Node: Concept Index118124
Node: How to configure54765
Node: Network interfaces59241
Node: Example configuration61620
Node: Running tinc66713
Node: Runtime options67300
Node: Signals70160
Node: Debug levels71009
Node: Solving problems71945
Node: Error messages73371
Node: Sending bug reports77688
Node: Controlling tinc78635
Node: tinc runtime options79012
Node: tinc environment variables79699
Node: tinc commands80028
Node: tinc examples85138
Node: tinc top85701
Node: Technical information87286
Node: The connection87521
Node: The UDP tunnel87833
Node: The meta-connection90878
Node: The meta-protocol92336
Node: Security97319
Node: Legacy authentication protocol98656
Node: Simple Peer-to-Peer Security103273
Node: Encryption of network packets108933
Node: Security issues111562
Node: Platform specific information113297
Node: Interface configuration113525
Node: Routes115966
Node: About us117877
Node: Contact information118052
Node: Authors118454
Node: Concept Index118856

End Tag Table

View file

@ -1346,7 +1346,7 @@ Setting this options also implicitly sets IndirectData.
@cindex scripts
Apart from reading the server and host configuration files,
tinc can also run scripts at certain moments.
Under Windows (not Cygwin), the scripts should have the extension .bat.
Under Windows (not Cygwin), the scripts should have the extension @file{.bat} or @file{.cmd}.
@table @file
@cindex tinc-up
@ -1380,13 +1380,20 @@ The Subnet and the node it belongs to are passed in environment variables.
@item @value{sysconfdir}/tinc/@var{netname}/subnet-down
This script is started when a Subnet becomes unreachable.
@item @value{sysconfdir}/tinc/@var{netname}/invitation-created
This script is started when a new invitation has been created.
@item @value{sysconfdir}/tinc/@var{netname}/invitation-accepted
This script is started when an invitation has been used.
@end table
@cindex environment variables
The scripts are started without command line arguments,
but can make use of certain environment variables.
Under UNIX like operating systems the names of environment variables must be preceded by a $ in scripts.
Under Windows, in @file{.bat} files, they have to be put between % signs.
Under Windows, in @file{.bat} or @file{.cmd} files, they have to be put between % signs.
@table @env
@cindex NETNAME
@ -1424,8 +1431,24 @@ this is set to the port number it uses for communication with other tinc daemons
@item SUBNET
When a subnet becomes (un)reachable, this is set to the subnet.
@cindex WEIGHT
@item WEIGHT
When a subnet becomes (un)reachable, this is set to the subnet weight.
@cindex INVITATION_FILE
@item INVITATION_FILE
When the @file{invitation-created} script is called,
this is set to the file where the invitation details will be stored.
@cindex INVITATION_URL
@item INVITATION_URL
When the @file{invitation-created} script is called,
this is set to the invitation URL that has been created.
@end table
Do not forget that under UNIX operating systems,
you have to make the scripts executable, using the command @samp{chmod a+x script}.
@c ==================================================================
@node How to configure