Import Upstream version 1.0.19
This commit is contained in:
parent
e5d35e092f
commit
d131e9a06f
36 changed files with 1563 additions and 683 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# Makefile.in generated by automake 1.11.3 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.11.5 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
|
|
@ -15,6 +15,23 @@
|
|||
|
||||
@SET_MAKE@
|
||||
VPATH = @srcdir@
|
||||
am__make_dryrun = \
|
||||
{ \
|
||||
am__dry=no; \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
|
||||
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
|
||||
*) \
|
||||
for am__flg in $$MAKEFLAGS; do \
|
||||
case $$am__flg in \
|
||||
*=*|--*) ;; \
|
||||
*n*) am__dry=yes; break;; \
|
||||
esac; \
|
||||
done;; \
|
||||
esac; \
|
||||
test $$am__dry = yes; \
|
||||
}
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
|
|
@ -40,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/attribute.m4 \
|
|||
$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/configure.in
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
|
|
@ -58,6 +75,11 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
|
|||
MAKEINFOHTML = $(MAKEINFO) --html
|
||||
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
|
||||
DVIPS = dvips
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man5dir)" \
|
||||
"$(DESTDIR)$(man8dir)"
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
|
|
@ -306,9 +328,7 @@ uninstall-html-am:
|
|||
|
||||
uninstall-info-am:
|
||||
@$(PRE_UNINSTALL)
|
||||
@if test -d '$(DESTDIR)$(infodir)' && \
|
||||
(install-info --version && \
|
||||
install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
|
||||
@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
|
||||
list='$(INFO_DEPS)'; \
|
||||
for file in $$list; do \
|
||||
relfile=`echo "$$file" | sed 's|^.*/||'`; \
|
||||
|
|
@ -381,11 +401,18 @@ maintainer-clean-aminfo:
|
|||
done
|
||||
install-man5: $(man_MANS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
|
||||
@list=''; test -n "$(man5dir)" || exit 0; \
|
||||
{ for i in $$list; do echo "$$i"; done; \
|
||||
l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
|
||||
sed -n '/\.5[a-z]*$$/p'; \
|
||||
@list1=''; \
|
||||
list2='$(man_MANS)'; \
|
||||
test -n "$(man5dir)" \
|
||||
&& test -n "`echo $$list1$$list2`" \
|
||||
|| exit 0; \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
|
||||
{ for i in $$list1; do echo "$$i"; done; \
|
||||
if test -n "$$list2"; then \
|
||||
for i in $$list2; do echo "$$i"; done \
|
||||
| sed -n '/\.5[a-z]*$$/p'; \
|
||||
fi; \
|
||||
} | while read p; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; echo "$$p"; \
|
||||
|
|
@ -417,11 +444,18 @@ uninstall-man5:
|
|||
dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
|
||||
install-man8: $(man_MANS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
|
||||
@list=''; test -n "$(man8dir)" || exit 0; \
|
||||
{ for i in $$list; do echo "$$i"; done; \
|
||||
l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
|
||||
sed -n '/\.8[a-z]*$$/p'; \
|
||||
@list1=''; \
|
||||
list2='$(man_MANS)'; \
|
||||
test -n "$(man8dir)" \
|
||||
&& test -n "`echo $$list1$$list2`" \
|
||||
|| exit 0; \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
|
||||
{ for i in $$list1; do echo "$$i"; done; \
|
||||
if test -n "$$list2"; then \
|
||||
for i in $$list2; do echo "$$i"; done \
|
||||
| sed -n '/\.8[a-z]*$$/p'; \
|
||||
fi; \
|
||||
} | while read p; do \
|
||||
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; echo "$$p"; \
|
||||
|
|
@ -568,8 +602,11 @@ install-dvi: install-dvi-am
|
|||
|
||||
install-dvi-am: $(DVIS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(dvidir)" || $(MKDIR_P) "$(DESTDIR)$(dvidir)"
|
||||
@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
|
|
@ -584,8 +621,11 @@ install-html: install-html-am
|
|||
|
||||
install-html-am: $(HTMLS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
|
||||
@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
$(am__strip_dir) \
|
||||
|
|
@ -608,9 +648,12 @@ install-info: install-info-am
|
|||
|
||||
install-info-am: $(INFO_DEPS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(infodir)" || $(MKDIR_P) "$(DESTDIR)$(infodir)"
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
|
||||
fi; \
|
||||
for file in $$list; do \
|
||||
case $$file in \
|
||||
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
|
|
@ -628,13 +671,7 @@ install-info-am: $(INFO_DEPS)
|
|||
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
|
||||
$(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
|
||||
@$(POST_INSTALL)
|
||||
@am__run_installinfo=yes; \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) am__run_installinfo=no;; \
|
||||
*) (install-info --version) >/dev/null 2>&1 \
|
||||
|| am__run_installinfo=no;; \
|
||||
esac; \
|
||||
if test $$am__run_installinfo = yes; then \
|
||||
@if $(am__can_run_installinfo); then \
|
||||
list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
|
||||
for file in $$list; do \
|
||||
relfile=`echo "$$file" | sed 's|^.*/||'`; \
|
||||
|
|
@ -648,8 +685,11 @@ install-pdf: install-pdf-am
|
|||
|
||||
install-pdf-am: $(PDFS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
|
||||
@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
|
|
@ -661,8 +701,11 @@ install-ps: install-ps-am
|
|||
|
||||
install-ps-am: $(PSS)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(psdir)" || $(MKDIR_P) "$(DESTDIR)$(psdir)"
|
||||
@list='$(PSS)'; test -n "$(psdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
echo "$$d$$p"; \
|
||||
|
|
|
|||
Binary file not shown.
198
doc/texinfo.tex
198
doc/texinfo.tex
|
|
@ -3,11 +3,11 @@
|
|||
% Load plain if necessary, i.e., if running under initex.
|
||||
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
|
||||
%
|
||||
\def\texinfoversion{2012-01-03.09}
|
||||
\def\texinfoversion{2012-03-11.15}
|
||||
%
|
||||
% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
|
||||
% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
% 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
% 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
|
||||
%
|
||||
% This texinfo.tex file is free software: you can redistribute it and/or
|
||||
% modify it under the terms of the GNU General Public License as
|
||||
|
|
@ -887,7 +887,7 @@ where each line of input produces a line of output.}
|
|||
\def\popthisfilestack{\errthisfilestackempty}
|
||||
\def\errthisfilestackempty{\errmessage{Internal error:
|
||||
the stack of filenames is empty.}}
|
||||
|
||||
%
|
||||
\def\thisfile{}
|
||||
|
||||
% @center line
|
||||
|
|
@ -895,36 +895,46 @@ where each line of input produces a line of output.}
|
|||
%
|
||||
\parseargdef\center{%
|
||||
\ifhmode
|
||||
\let\next\centerH
|
||||
\let\centersub\centerH
|
||||
\else
|
||||
\let\next\centerV
|
||||
\let\centersub\centerV
|
||||
\fi
|
||||
\next{\hfil \ignorespaces#1\unskip \hfil}%
|
||||
\centersub{\hfil \ignorespaces#1\unskip \hfil}%
|
||||
\let\centersub\relax % don't let the definition persist, just in case
|
||||
}
|
||||
\def\centerH#1{%
|
||||
{%
|
||||
\hfil\break
|
||||
\advance\hsize by -\leftskip
|
||||
\advance\hsize by -\rightskip
|
||||
\line{#1}%
|
||||
\break
|
||||
}%
|
||||
\def\centerH#1{{%
|
||||
\hfil\break
|
||||
\advance\hsize by -\leftskip
|
||||
\advance\hsize by -\rightskip
|
||||
\line{#1}%
|
||||
\break
|
||||
}}
|
||||
%
|
||||
\newcount\centerpenalty
|
||||
\def\centerV#1{%
|
||||
% The idea here is the same as in \startdefun, \cartouche, etc.: if
|
||||
% @center is the first thing after a section heading, we need to wipe
|
||||
% out the negative parskip inserted by \sectionheading, but still
|
||||
% prevent a page break here.
|
||||
\centerpenalty = \lastpenalty
|
||||
\ifnum\centerpenalty>10000 \vskip\parskip \fi
|
||||
\ifnum\centerpenalty>9999 \penalty\centerpenalty \fi
|
||||
\line{\kern\leftskip #1\kern\rightskip}%
|
||||
}
|
||||
\def\centerV#1{\line{\kern\leftskip #1\kern\rightskip}}
|
||||
|
||||
% @sp n outputs n lines of vertical space
|
||||
|
||||
%
|
||||
\parseargdef\sp{\vskip #1\baselineskip}
|
||||
|
||||
% @comment ...line which is ignored...
|
||||
% @c is the same as @comment
|
||||
% @ignore ... @end ignore is another way to write a comment
|
||||
|
||||
%
|
||||
\def\comment{\begingroup \catcode`\^^M=\other%
|
||||
\catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
|
||||
\commentxxx}
|
||||
{\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
|
||||
|
||||
%
|
||||
\let\c=\comment
|
||||
|
||||
% @paragraphindent NCHARS
|
||||
|
|
@ -1173,8 +1183,8 @@ output) for that.)}
|
|||
%
|
||||
% #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
|
||||
\def\dopdfimage#1#2#3{%
|
||||
\def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
|
||||
\def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
|
||||
\def\pdfimagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
|
||||
\def\pdfimageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
|
||||
%
|
||||
% pdftex (and the PDF format) support .pdf, .png, .jpg (among
|
||||
% others). Let's try in that order, PDF first since if
|
||||
|
|
@ -1212,8 +1222,8 @@ output) for that.)}
|
|||
\else
|
||||
\immediate\pdfximage
|
||||
\fi
|
||||
\ifdim \wd0 >0pt width \imagewidth \fi
|
||||
\ifdim \wd2 >0pt height \imageheight \fi
|
||||
\ifdim \wd0 >0pt width \pdfimagewidth \fi
|
||||
\ifdim \wd2 >0pt height \pdfimageheight \fi
|
||||
\ifnum\pdftexversion<13
|
||||
#1.\pdfimgext
|
||||
\else
|
||||
|
|
@ -1362,7 +1372,13 @@ output) for that.)}
|
|||
\fi
|
||||
\fi
|
||||
\nextsp}
|
||||
\def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
|
||||
\def\getfilename#1{%
|
||||
\filenamelength=0
|
||||
% If we don't expand the argument now, \skipspaces will get
|
||||
% snagged on things like "@value{foo}".
|
||||
\edef\temp{#1}%
|
||||
\expandafter\skipspaces\temp|\relax
|
||||
}
|
||||
\ifnum\pdftexversion < 14
|
||||
\let \startlink \pdfannotlink
|
||||
\else
|
||||
|
|
@ -2842,8 +2858,8 @@ end
|
|||
%
|
||||
\def\outfmtnametex{tex}
|
||||
%
|
||||
\def\inlinefmt#1{\doinlinefmt #1,\finish}
|
||||
\def\doinlinefmt#1,#2,\finish{%
|
||||
\long\def\inlinefmt#1{\doinlinefmt #1,\finish}
|
||||
\long\def\doinlinefmt#1,#2,\finish{%
|
||||
\def\inlinefmtname{#1}%
|
||||
\ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi
|
||||
}
|
||||
|
|
@ -2855,8 +2871,8 @@ end
|
|||
% well use a command to get a left brace too. We could re-use the
|
||||
% delimiter character idea from \verb, but it seems like overkill.
|
||||
%
|
||||
\def\inlineraw{\tex \doinlineraw}
|
||||
\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
|
||||
\long\def\inlineraw{\tex \doinlineraw}
|
||||
\long\def\doinlineraw#1{\doinlinerawtwo #1,\finish}
|
||||
\def\doinlinerawtwo#1,#2,\finish{%
|
||||
\def\inlinerawname{#1}%
|
||||
\ifx\inlinerawname\outfmtnametex \ignorespaces #2\fi
|
||||
|
|
@ -4732,10 +4748,9 @@ end
|
|||
%
|
||||
% ..., ready, GO:
|
||||
%
|
||||
\def\safewhatsit#1{%
|
||||
\ifhmode
|
||||
\def\safewhatsit#1{\ifhmode
|
||||
#1%
|
||||
\else
|
||||
\else
|
||||
% \lastskip and \lastpenalty cannot both be nonzero simultaneously.
|
||||
\whatsitskip = \lastskip
|
||||
\edef\lastskipmacro{\the\lastskip}%
|
||||
|
|
@ -4759,7 +4774,6 @@ end
|
|||
% to re-insert the same penalty (values >10000 are used for various
|
||||
% signals); since we just inserted a non-discardable item, any
|
||||
% following glue (such as a \parskip) would be a breakpoint. For example:
|
||||
%
|
||||
% @deffn deffn-whatever
|
||||
% @vindex index-whatever
|
||||
% Description.
|
||||
|
|
@ -4772,8 +4786,7 @@ end
|
|||
% (the whatsit from the \write), so we must insert a \nobreak.
|
||||
\nobreak\vskip\whatsitskip
|
||||
\fi
|
||||
\fi
|
||||
}
|
||||
\fi}
|
||||
|
||||
% The index entry written in the file actually looks like
|
||||
% \entry {sortstring}{page}{topic}
|
||||
|
|
@ -5876,14 +5889,15 @@ end
|
|||
%
|
||||
% We'll almost certainly start a paragraph next, so don't let that
|
||||
% glue accumulate. (Not a breakpoint because it's preceded by a
|
||||
% discardable item.)
|
||||
% discardable item.) However, when a paragraph is not started next
|
||||
% (\startdefun, \cartouche, \center, etc.), this needs to be wiped out
|
||||
% or the negative glue will cause weirdly wrong output, typically
|
||||
% obscuring the section heading with something else.
|
||||
\vskip-\parskip
|
||||
%
|
||||
% This is purely so the last item on the list is a known \penalty >
|
||||
% 10000. This is so \startdefun can avoid allowing breakpoints after
|
||||
% section headings. Otherwise, it would insert a valid breakpoint between:
|
||||
% @section sec-whatever
|
||||
% @deffn def-whatever
|
||||
% This is so the last item on the main vertical list is a known
|
||||
% \penalty > 10000, so \startdefun, etc., can recognize the situation
|
||||
% and do the needful.
|
||||
\penalty 10001
|
||||
}
|
||||
|
||||
|
|
@ -6303,7 +6317,7 @@ end
|
|||
% If this cartouche directly follows a sectioning command, we need the
|
||||
% \parskip glue (backspaced over by default) or the cartouche can
|
||||
% collide with the section heading.
|
||||
\ifnum\lastpenalty>10000 \vskip\parskip \fi
|
||||
\ifnum\lastpenalty>10000 \vskip\parskip \penalty\lastpenalty \fi
|
||||
%
|
||||
\vbox\bgroup
|
||||
\baselineskip=0pt\parskip=0pt\lineskip=0pt
|
||||
|
|
@ -7802,26 +7816,36 @@ end
|
|||
\def\pxref#1{\putwordsee{} \xrefX[#1,,,,,,,]}
|
||||
\def\xref#1{\putwordSee{} \xrefX[#1,,,,,,,]}
|
||||
\def\ref#1{\xrefX[#1,,,,,,,]}
|
||||
%
|
||||
\newbox\topbox
|
||||
\newbox\printedrefnamebox
|
||||
\newbox\printedmanualbox
|
||||
%
|
||||
\def\xrefX[#1,#2,#3,#4,#5,#6]{\begingroup
|
||||
\unsepspaces
|
||||
\def\printedmanual{\ignorespaces #5}%
|
||||
%
|
||||
\def\printedrefname{\ignorespaces #3}%
|
||||
\setbox1=\hbox{\printedmanual\unskip}%
|
||||
\setbox0=\hbox{\printedrefname\unskip}%
|
||||
\ifdim \wd0 = 0pt
|
||||
\setbox\printedrefnamebox = \hbox{\printedrefname\unskip}%
|
||||
%
|
||||
\def\printedmanual{\ignorespaces #5}%
|
||||
\setbox\printedmanualbox = \hbox{\printedmanual\unskip}%
|
||||
%
|
||||
% If the printed reference name (arg #3) was not explicitly given in
|
||||
% the @xref, figure out what we want to use.
|
||||
\ifdim \wd\printedrefnamebox = 0pt
|
||||
% No printed node name was explicitly given.
|
||||
\expandafter\ifx\csname SETxref-automatic-section-title\endcsname \relax
|
||||
% Use the node name inside the square brackets.
|
||||
% Not auto section-title: use node name inside the square brackets.
|
||||
\def\printedrefname{\ignorespaces #1}%
|
||||
\else
|
||||
% Use the actual chapter/section title appear inside
|
||||
% the square brackets. Use the real section title if we have it.
|
||||
\ifdim \wd1 > 0pt
|
||||
% It is in another manual, so we don't have it.
|
||||
% Auto section-title: use chapter/section title inside
|
||||
% the square brackets if we have it.
|
||||
\ifdim \wd\printedmanualbox > 0pt
|
||||
% It is in another manual, so we don't have it; use node name.
|
||||
\def\printedrefname{\ignorespaces #1}%
|
||||
\else
|
||||
\ifhavexrefs
|
||||
% We know the real title if we have the xref values.
|
||||
% We (should) know the real title if we have the xref values.
|
||||
\def\printedrefname{\refx{#1-title}{}}%
|
||||
\else
|
||||
% Otherwise just copy the Info node name.
|
||||
|
|
@ -7835,6 +7859,7 @@ end
|
|||
\ifpdf
|
||||
{\indexnofonts
|
||||
\turnoffactive
|
||||
\makevalueexpandable
|
||||
% This expands tokens, so do it after making catcode changes, so _
|
||||
% etc. don't get their TeX definitions.
|
||||
\getfilename{#4}%
|
||||
|
|
@ -7867,7 +7892,7 @@ end
|
|||
\iffloat\Xthisreftitle
|
||||
% If the user specified the print name (third arg) to the ref,
|
||||
% print it instead of our usual "Figure 1.2".
|
||||
\ifdim\wd0 = 0pt
|
||||
\ifdim\wd\printedrefnamebox = 0pt
|
||||
\refx{#1-snt}{}%
|
||||
\else
|
||||
\printedrefname
|
||||
|
|
@ -7875,21 +7900,46 @@ end
|
|||
%
|
||||
% if the user also gave the printed manual name (fifth arg), append
|
||||
% "in MANUALNAME".
|
||||
\ifdim \wd1 > 0pt
|
||||
\ifdim \wd\printedmanualbox > 0pt
|
||||
\space \putwordin{} \cite{\printedmanual}%
|
||||
\fi
|
||||
\else
|
||||
% node/anchor (non-float) references.
|
||||
%
|
||||
% If we use \unhbox0 and \unhbox1 to print the node names, TeX does not
|
||||
% insert empty discretionaries after hyphens, which means that it will
|
||||
% not find a line break at a hyphen in a node names. Since some manuals
|
||||
% are best written with fairly long node names, containing hyphens, this
|
||||
% is a loss. Therefore, we give the text of the node name again, so it
|
||||
% is as if TeX is seeing it for the first time.
|
||||
\ifdim \wd1 > 0pt
|
||||
\putwordSection{} ``\printedrefname'' \putwordin{} \cite{\printedmanual}%
|
||||
%
|
||||
% If we use \unhbox to print the node names, TeX does not insert
|
||||
% empty discretionaries after hyphens, which means that it will not
|
||||
% find a line break at a hyphen in a node names. Since some manuals
|
||||
% are best written with fairly long node names, containing hyphens,
|
||||
% this is a loss. Therefore, we give the text of the node name
|
||||
% again, so it is as if TeX is seeing it for the first time.
|
||||
%
|
||||
% Cross-manual reference. Only include the "Section ``foo'' in" if
|
||||
% the foo is neither missing or Top. Thus, @xref{,,,foo,The Foo Manual}
|
||||
% outputs simply "see The Foo Manual".
|
||||
\ifdim \wd\printedmanualbox > 0pt
|
||||
% What is the 7sp about? The idea is that we also want to omit
|
||||
% the Section part if we would be printing "Top", since they are
|
||||
% clearly trying to refer to the whole manual. But, this being
|
||||
% TeX, we can't easily compare strings while ignoring the possible
|
||||
% spaces before and after in the input. By adding the arbitrary
|
||||
% 7sp, we make it much less likely that a real node name would
|
||||
% happen to have the same width as "Top" (e.g., in a monospaced font).
|
||||
% I hope it will never happen in practice.
|
||||
%
|
||||
% For the same basic reason, we retypeset the "Top" at every
|
||||
% reference, since the current font is indeterminate.
|
||||
%
|
||||
\setbox\topbox = \hbox{Top\kern7sp}%
|
||||
\setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}%
|
||||
\ifdim \wd2 > 7sp
|
||||
\ifdim \wd2 = \wd\topbox \else
|
||||
\putwordSection{} ``\printedrefname'' \putwordin{}\space
|
||||
\fi
|
||||
\fi
|
||||
\cite{\printedmanual}%
|
||||
\else
|
||||
% Reference in this manual.
|
||||
%
|
||||
% _ (for example) has to be the character _ for the purposes of the
|
||||
% control sequence corresponding to the node, but it has to expand
|
||||
% into the usual \leavevmode...\vrule stuff for purposes of
|
||||
|
|
@ -7901,7 +7951,7 @@ end
|
|||
\setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
|
||||
\ifdim \wd2 > 0pt \refx{#1-snt}\space\fi
|
||||
}%
|
||||
% output the `[mynode]' via a macro so it can be overridden.
|
||||
% output the `[mynode]' via the macro below so it can be overridden.
|
||||
\xrefprintnodename\printedrefname
|
||||
%
|
||||
% But we always want a comma and a space:
|
||||
|
|
@ -8281,7 +8331,7 @@ end
|
|||
it from ftp://tug.org/tex/epsf.tex.}
|
||||
%
|
||||
\def\image#1{%
|
||||
\ifx\epsfbox\thisiundefined
|
||||
\ifx\epsfbox\thisisundefined
|
||||
\ifwarnednoepsf \else
|
||||
\errhelp = \noepsfhelp
|
||||
\errmessage{epsf.tex not found, images will be ignored}%
|
||||
|
|
@ -8305,6 +8355,13 @@ end
|
|||
% If the image is by itself, center it.
|
||||
\ifvmode
|
||||
\imagevmodetrue
|
||||
\else \ifx\centersub\centerV
|
||||
% for @center @image, we need a vbox so we can have our vertical space
|
||||
\imagevmodetrue
|
||||
\vbox\bgroup % vbox has better behavior than vtop herev
|
||||
\fi\fi
|
||||
%
|
||||
\ifimagevmode
|
||||
\nobreak\medskip
|
||||
% Usually we'll have text after the image which will insert
|
||||
% \parskip glue, so insert it here too to equalize the space
|
||||
|
|
@ -8314,9 +8371,13 @@ end
|
|||
\fi
|
||||
%
|
||||
% Leave vertical mode so that indentation from an enclosing
|
||||
% environment such as @quotation is respected. On the other hand, if
|
||||
% it's at the top level, we don't want the normal paragraph indentation.
|
||||
\noindent
|
||||
% environment such as @quotation is respected.
|
||||
% However, if we're at the top level, we don't want the
|
||||
% normal paragraph indentation.
|
||||
% On the other hand, if we are in the case of @center @image, we don't
|
||||
% want to start a paragraph, which will create a hsize-width box and
|
||||
% eradicate the centering.
|
||||
\ifx\centersub\centerV\else \noindent \fi
|
||||
%
|
||||
% Output the image.
|
||||
\ifpdf
|
||||
|
|
@ -8328,7 +8389,10 @@ end
|
|||
\epsfbox{#1.eps}%
|
||||
\fi
|
||||
%
|
||||
\ifimagevmode \medskip \fi % space after the standalone image
|
||||
\ifimagevmode
|
||||
\medskip % space after a standalone image
|
||||
\fi
|
||||
\ifx\centersub\centerV \egroup \fi
|
||||
\endgroup}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -159,8 +159,25 @@ It is possible to bind only to a single interface with this variable.
|
|||
.Pp
|
||||
This option may not work on all platforms.
|
||||
|
||||
.It Va Broadcast Li = yes | no Po yes Pc Bq experimental
|
||||
When disabled, tinc will drop all broadcast and multicast packets, in both router and switch mode.
|
||||
.It Va Broadcast Li = no | mst | direct Po mst Pc Bq experimental
|
||||
This option selects the way broadcast packets are sent to other daemons.
|
||||
NOTE: all nodes in a VPN must use the same
|
||||
.Va Broadcast
|
||||
mode, otherwise routing loops can form.
|
||||
|
||||
.Bl -tag -width indent
|
||||
.It no
|
||||
Broadcast packets are never sent to other nodes.
|
||||
|
||||
.It mst
|
||||
Broadcast packets are sent and forwarded via the VPN's Minimum Spanning Tree.
|
||||
This ensures broadcast packets reach all nodes.
|
||||
|
||||
.It direct
|
||||
Broadcast packets are sent directly to all nodes that can be reached directly.
|
||||
Broadcast packets received from other nodes are never forwarded.
|
||||
If the IndirectData option is also set, broadcast packets will only be sent to nodes which we have a meta connection to.
|
||||
.El
|
||||
|
||||
.It Va ConnectTo Li = Ar name
|
||||
Specifies which other tinc daemon to connect to on startup.
|
||||
|
|
@ -394,6 +411,19 @@ while no routing table is managed.
|
|||
.It Va Name Li = Ar name Bq required
|
||||
This is the name which identifies this tinc daemon.
|
||||
It must be unique for the virtual private network this daemon will connect to.
|
||||
The Name may only consist of alphanumeric and underscore characters.
|
||||
|
||||
If
|
||||
.Va Name
|
||||
starts with a
|
||||
.Li $ ,
|
||||
then the contents of the environment variable that follows will be used.
|
||||
In that case, invalid characters will be converted to underscores.
|
||||
If
|
||||
.Va Name
|
||||
is
|
||||
.Li $HOST ,
|
||||
but no such environment variable exist, the hostname will be read using the gethostnname() system call.
|
||||
|
||||
.It Va PingInterval Li = Ar seconds Pq 60
|
||||
The number of seconds of inactivity that
|
||||
|
|
@ -426,8 +456,41 @@ specified in the configuration file.
|
|||
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.
|
||||
|
||||
.It Va Proxy Li = socks4 | socks5 | http | exec Ar ... Bq experimental
|
||||
Use a proxy when making outgoing connections.
|
||||
The following proxy types are currently supported:
|
||||
.Bl -tag -width indent
|
||||
.It socks4 Ar address Ar port Op Ar username
|
||||
Connects to the proxy using the SOCKS version 4 protocol.
|
||||
Optionally, a
|
||||
.Ar username
|
||||
can be supplied which will be passed on to the proxy server.
|
||||
Only IPv4 connections can be proxied using SOCKS 4.
|
||||
.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.
|
||||
.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
|
||||
|
||||
.It Va ReplayWindow Li = Ar bytes Pq 16
|
||||
This 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.
|
||||
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
|
||||
|
|
@ -564,12 +627,11 @@ variables can be specified.
|
|||
Subnets can either be single MAC, IPv4 or IPv6 addresses,
|
||||
in which case a subnet consisting of only that single address is assumed,
|
||||
or they can be a IPv4 or IPv6 network address with a prefixlength.
|
||||
Shorthand notations are not supported.
|
||||
For example, IPv4 subnets must be in a form like 192.168.1.0/24,
|
||||
where 192.168.1.0 is the network address and 24 is the number of bits set in the netmask.
|
||||
Note that subnets like 192.168.1.1/24 are invalid!
|
||||
Read a networking HOWTO/FAQ/guide if you don't understand this.
|
||||
IPv6 subnets are notated like fec0:0:0:1:0:0:0:0/64.
|
||||
IPv6 subnets are notated like fec0:0:0:1::/64.
|
||||
MAC addresses are notated like 0:1a:2b:3c:4d:5e.
|
||||
|
||||
.Pp
|
||||
|
|
|
|||
210
doc/tinc.info
210
doc/tinc.info
|
|
@ -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.0.17, a Virtual Private
|
||||
This is the info manual for tinc version 1.0.19, a Virtual Private
|
||||
Network daemon.
|
||||
|
||||
Copyright (C) 1998-2012 Ivo Timmermans, Guus Sliepen
|
||||
|
|
@ -705,9 +705,25 @@ BindToInterface = <INTERFACE> [experimental]
|
|||
|
||||
This option may not work on all platforms.
|
||||
|
||||
Broadcast = <yes | no> (yes) [experimental]
|
||||
When disabled, tinc will drop all broadcast and multicast packets,
|
||||
in both router and switch mode.
|
||||
Broadcast = <no | mst | direct> (mst) [experimental]
|
||||
This option selects the way broadcast packets are sent to other
|
||||
daemons. _NOTE: all nodes in a VPN must use the same Broadcast
|
||||
mode, otherwise routing loops can form._
|
||||
|
||||
no
|
||||
Broadcast packets are never sent to other nodes.
|
||||
|
||||
mst
|
||||
Broadcast packets are sent and forwarded via the VPN's
|
||||
Minimum Spanning Tree. This ensures broadcast packets reach
|
||||
all nodes.
|
||||
|
||||
direct
|
||||
Broadcast packets are sent directly to all nodes that can be
|
||||
reached directly. Broadcast packets received from other
|
||||
nodes are never forwarded. If the IndirectData option is
|
||||
also set, broadcast packets will only be sent to nodes which
|
||||
we have a meta connection to.
|
||||
|
||||
ConnectTo = <NAME>
|
||||
Specifies which other tinc daemon to connect to on startup.
|
||||
|
|
@ -909,6 +925,12 @@ Name = <NAME> [required]
|
|||
consist only of alfanumeric and underscore characters (a-z, A-Z,
|
||||
0-9 and _).
|
||||
|
||||
If Name starts with a $, then the contents of the environment
|
||||
variable that follows will be used. In that case, invalid
|
||||
characters will be converted to underscores. If Name is $HOST,
|
||||
but no such environment variable exist, the hostname will be read
|
||||
using the gethostnname() system call.
|
||||
|
||||
PingInterval = <SECONDS> (60)
|
||||
The number of seconds of inactivity that tinc will wait before
|
||||
sending a probe to the other end.
|
||||
|
|
@ -943,6 +965,29 @@ ProcessPriority = <low|normal|high>
|
|||
adjusted. Increasing the priority may help to reduce latency and
|
||||
packet loss on the VPN.
|
||||
|
||||
Proxy = socks4 | socks4 | http | exec ... [experimental]
|
||||
Use a proxy when making outgoing connections. The following proxy
|
||||
types are currently supported:
|
||||
|
||||
socks4 <ADDRESS> <PORT> [<USERNAME>]
|
||||
Connects to the proxy using the SOCKS version 4 protocol.
|
||||
Optionally, a USERNAME can be supplied which will be passed
|
||||
on to the proxy server.
|
||||
|
||||
socks4 <ADDRESS> <PORT> [<USERNAME> <PASSWORD>]
|
||||
Connect to the proxy using the SOCKS version 5 protocol. If
|
||||
a USERNAME and PASSWORD are given, basic username/password
|
||||
authentication will be used, otherwise no authentication will
|
||||
be used.
|
||||
|
||||
http <ADDRESS> <PORT>
|
||||
Connects to the proxy and sends a HTTP CONNECT request.
|
||||
|
||||
exec <COMMAND>
|
||||
Executes the given command which should set up the outgoing
|
||||
connection. The environment variables `NAME', `NODE',
|
||||
`REMOTEADDRES' and `REMOTEPORT' are available.
|
||||
|
||||
ReplayWindow = <bytes> (16)
|
||||
This is the size of the replay tracking window for each remote
|
||||
node, in bytes. The window is a bitfield which tracks 1 packet
|
||||
|
|
@ -1061,13 +1106,12 @@ Subnet = <ADDRESS[/PREFIXLENGTH[#WEIGHT]]>
|
|||
Subnets can either be single MAC, IPv4 or IPv6 addresses, in which
|
||||
case a subnet consisting of only that single address is assumed,
|
||||
or they can be a IPv4 or IPv6 network address with a prefixlength.
|
||||
Shorthand notations are not supported. For example, IPv4 subnets
|
||||
must be in a form like 192.168.1.0/24, where 192.168.1.0 is the
|
||||
network address and 24 is the number of bits set in the netmask.
|
||||
Note that subnets like 192.168.1.1/24 are invalid! Read a
|
||||
networking HOWTO/FAQ/guide if you don't understand this. IPv6
|
||||
subnets are notated like fec0:0:0:1:0:0:0:0/64. MAC addresses are
|
||||
notated like 0:1a:2b:3c:4d:5e.
|
||||
For example, IPv4 subnets must be in a form like 192.168.1.0/24,
|
||||
where 192.168.1.0 is the network address and 24 is the number of
|
||||
bits set in the netmask. Note that subnets like 192.168.1.1/24
|
||||
are invalid! Read a networking HOWTO/FAQ/guide if you don't
|
||||
understand this. IPv6 subnets are notated like fec0:0:0:1::/64.
|
||||
MAC addresses are notated like 0:1a:2b:3c:4d:5e.
|
||||
|
||||
Prefixlength is the number of bits set to 1 in the netmask part;
|
||||
for example: netmask 255.255.255.0 would become /24, 255.255.252.0
|
||||
|
|
@ -2386,7 +2430,7 @@ Concept Index
|
|||
* CHALLENGE: Authentication protocol.
|
||||
(line 10)
|
||||
* CIDR notation: Host configuration variables.
|
||||
(line 92)
|
||||
(line 91)
|
||||
* Cipher: Host configuration variables.
|
||||
(line 12)
|
||||
* ClampMSS: Host configuration variables.
|
||||
|
|
@ -2398,74 +2442,78 @@ Concept Index
|
|||
(line 24)
|
||||
* connection: The connection. (line 6)
|
||||
* ConnectTo: Main configuration variables.
|
||||
(line 37)
|
||||
(line 53)
|
||||
* daemon: Running tinc. (line 11)
|
||||
* data-protocol: The meta-connection. (line 18)
|
||||
* debug level: Runtime options. (line 17)
|
||||
* debug levels: Debug levels. (line 6)
|
||||
* DecrementTTL: Main configuration variables.
|
||||
(line 48)
|
||||
(line 64)
|
||||
* DEL_EDGE: The meta-protocol. (line 47)
|
||||
* DEL_SUBNET: The meta-protocol. (line 47)
|
||||
* DEVICE: Scripts. (line 55)
|
||||
* Device: Main configuration variables.
|
||||
(line 57)
|
||||
(line 73)
|
||||
* device files: Device files. (line 6)
|
||||
* DeviceType: Main configuration variables.
|
||||
(line 64)
|
||||
(line 80)
|
||||
* Digest: Host configuration variables.
|
||||
(line 29)
|
||||
* DirectOnly: Main configuration variables.
|
||||
(line 129)
|
||||
(line 145)
|
||||
* dummy: Main configuration variables.
|
||||
(line 71)
|
||||
(line 87)
|
||||
* encapsulating: The UDP tunnel. (line 30)
|
||||
* encryption: Encryption of network packets.
|
||||
(line 6)
|
||||
* environment variables: Scripts. (line 43)
|
||||
* example: Example configuration.
|
||||
(line 6)
|
||||
* exec: Main configuration variables.
|
||||
(line 311)
|
||||
* Forwarding: Main configuration variables.
|
||||
(line 136)
|
||||
(line 152)
|
||||
* frame type: The UDP tunnel. (line 6)
|
||||
* GraphDumpFile: Main configuration variables.
|
||||
(line 156)
|
||||
(line 172)
|
||||
* Hostnames: Main configuration variables.
|
||||
(line 164)
|
||||
(line 180)
|
||||
* http: Main configuration variables.
|
||||
(line 308)
|
||||
* hub: Main configuration variables.
|
||||
(line 216)
|
||||
(line 232)
|
||||
* ID: Authentication protocol.
|
||||
(line 10)
|
||||
* IndirectData: Host configuration variables.
|
||||
(line 34)
|
||||
* INTERFACE: Scripts. (line 58)
|
||||
* Interface: Main configuration variables.
|
||||
(line 174)
|
||||
(line 190)
|
||||
* IRC: Contact information. (line 9)
|
||||
* key generation: Generating keypairs. (line 6)
|
||||
* KEY_CHANGED: The meta-protocol. (line 64)
|
||||
* KeyExpire: Main configuration variables.
|
||||
(line 221)
|
||||
(line 237)
|
||||
* libraries: Libraries. (line 6)
|
||||
* license: OpenSSL. (line 36)
|
||||
* LocalDiscovery: Main configuration variables.
|
||||
(line 182)
|
||||
(line 198)
|
||||
* lzo: lzo. (line 6)
|
||||
* MACExpire: Main configuration variables.
|
||||
(line 227)
|
||||
(line 243)
|
||||
* MACLength: Host configuration variables.
|
||||
(line 42)
|
||||
* meta-protocol: The meta-connection. (line 18)
|
||||
* META_KEY: Authentication protocol.
|
||||
(line 10)
|
||||
* Mode: Main configuration variables.
|
||||
(line 193)
|
||||
(line 209)
|
||||
* multicast: Main configuration variables.
|
||||
(line 83)
|
||||
(line 99)
|
||||
* multiple networks: Multiple networks. (line 6)
|
||||
* NAME: Scripts. (line 52)
|
||||
* Name: Main configuration variables.
|
||||
(line 232)
|
||||
(line 248)
|
||||
* netmask: Network interfaces. (line 34)
|
||||
* NETNAME: Scripts. (line 49)
|
||||
* netname: Multiple networks. (line 6)
|
||||
|
|
@ -2478,9 +2526,9 @@ Concept Index
|
|||
(line 67)
|
||||
* PING: The meta-protocol. (line 89)
|
||||
* PingInterval: Main configuration variables.
|
||||
(line 237)
|
||||
(line 259)
|
||||
* PingTimeout: Main configuration variables.
|
||||
(line 241)
|
||||
(line 263)
|
||||
* platforms: Supported platforms. (line 6)
|
||||
* PMTU: Host configuration variables.
|
||||
(line 47)
|
||||
|
|
@ -2491,49 +2539,55 @@ Concept Index
|
|||
(line 55)
|
||||
* port numbers: Other files. (line 17)
|
||||
* PriorityInheritance: Main configuration variables.
|
||||
(line 247)
|
||||
(line 269)
|
||||
* private: Virtual Private Networks.
|
||||
(line 10)
|
||||
* PrivateKey: Main configuration variables.
|
||||
(line 252)
|
||||
(line 274)
|
||||
* PrivateKeyFile: Main configuration variables.
|
||||
(line 258)
|
||||
(line 280)
|
||||
* ProcessPriority: Main configuration variables.
|
||||
(line 266)
|
||||
(line 288)
|
||||
* Proxy: Main configuration variables.
|
||||
(line 293)
|
||||
* PublicKey: Host configuration variables.
|
||||
(line 59)
|
||||
* PublicKeyFile: Host configuration variables.
|
||||
(line 62)
|
||||
* raw_socket: Main configuration variables.
|
||||
(line 76)
|
||||
(line 92)
|
||||
* release: Supported platforms. (line 14)
|
||||
* REMOTEADDRESS: Scripts. (line 67)
|
||||
* REMOTEPORT: Scripts. (line 70)
|
||||
* ReplayWindow: Main configuration variables.
|
||||
(line 271)
|
||||
(line 316)
|
||||
* REQ_KEY: The meta-protocol. (line 64)
|
||||
* requirements: Libraries. (line 6)
|
||||
* router: Main configuration variables.
|
||||
(line 196)
|
||||
(line 212)
|
||||
* runtime options: Runtime options. (line 9)
|
||||
* scalability: tinc. (line 19)
|
||||
* scripts: Scripts. (line 6)
|
||||
* server: How connections work.
|
||||
(line 18)
|
||||
* signals: Signals. (line 6)
|
||||
* socks4: Main configuration variables.
|
||||
(line 297)
|
||||
* socks5: Main configuration variables.
|
||||
(line 302)
|
||||
* StrictSubnets: Main configuration variables.
|
||||
(line 282)
|
||||
(line 327)
|
||||
* SUBNET: Scripts. (line 74)
|
||||
* Subnet: Host configuration variables.
|
||||
(line 74)
|
||||
* Subnet weight: Host configuration variables.
|
||||
(line 97)
|
||||
(line 96)
|
||||
* SVPN: Security. (line 11)
|
||||
* switch: Main configuration variables.
|
||||
(line 205)
|
||||
(line 221)
|
||||
* TCP: The meta-connection. (line 10)
|
||||
* TCPonly: Host configuration variables.
|
||||
(line 104)
|
||||
(line 103)
|
||||
* TINC: Security. (line 6)
|
||||
* tinc: Introduction. (line 6)
|
||||
* tinc-down: Scripts. (line 18)
|
||||
|
|
@ -2542,24 +2596,24 @@ Concept Index
|
|||
* tincd: tinc. (line 14)
|
||||
* traditional VPNs: tinc. (line 19)
|
||||
* tunifhead: Main configuration variables.
|
||||
(line 118)
|
||||
(line 134)
|
||||
* TunnelServer: Main configuration variables.
|
||||
(line 287)
|
||||
(line 332)
|
||||
* tunnohead: Main configuration variables.
|
||||
(line 112)
|
||||
(line 128)
|
||||
* UDP <1>: Encryption of network packets.
|
||||
(line 12)
|
||||
* UDP: The UDP tunnel. (line 30)
|
||||
* UDPRcvBuf: Main configuration variables.
|
||||
(line 294)
|
||||
(line 339)
|
||||
* UDPSndBuf: Main configuration variables.
|
||||
(line 299)
|
||||
(line 344)
|
||||
* UML: Main configuration variables.
|
||||
(line 94)
|
||||
(line 110)
|
||||
* Universal tun/tap: Configuration of Linux kernels.
|
||||
(line 6)
|
||||
* VDE: Main configuration variables.
|
||||
(line 99)
|
||||
(line 115)
|
||||
* virtual: Virtual Private Networks.
|
||||
(line 18)
|
||||
* virtual network device: The UDP tunnel. (line 6)
|
||||
|
|
@ -2605,34 +2659,34 @@ Node: Multiple networks21169
|
|||
Node: How connections work22595
|
||||
Node: Configuration files23817
|
||||
Node: Main configuration variables25204
|
||||
Node: Host configuration variables39057
|
||||
Node: Scripts44468
|
||||
Node: How to configure47238
|
||||
Node: Generating keypairs48501
|
||||
Node: Network interfaces49000
|
||||
Node: Example configuration50848
|
||||
Node: Running tinc56171
|
||||
Node: Runtime options56761
|
||||
Node: Signals60061
|
||||
Node: Debug levels61253
|
||||
Node: Solving problems62189
|
||||
Node: Error messages63741
|
||||
Node: Sending bug reports67754
|
||||
Node: Technical information68706
|
||||
Node: The connection68937
|
||||
Node: The UDP tunnel69249
|
||||
Node: The meta-connection72310
|
||||
Node: The meta-protocol73779
|
||||
Node: Security78788
|
||||
Node: Authentication protocol79918
|
||||
Node: Encryption of network packets84922
|
||||
Node: Security issues86295
|
||||
Node: Platform specific information87912
|
||||
Node: Interface configuration88140
|
||||
Node: Routes90593
|
||||
Node: About us92509
|
||||
Node: Contact information92684
|
||||
Node: Authors93088
|
||||
Node: Concept Index93493
|
||||
Node: Host configuration variables40987
|
||||
Node: Scripts46347
|
||||
Node: How to configure49117
|
||||
Node: Generating keypairs50380
|
||||
Node: Network interfaces50879
|
||||
Node: Example configuration52727
|
||||
Node: Running tinc58050
|
||||
Node: Runtime options58640
|
||||
Node: Signals61940
|
||||
Node: Debug levels63132
|
||||
Node: Solving problems64068
|
||||
Node: Error messages65620
|
||||
Node: Sending bug reports69633
|
||||
Node: Technical information70585
|
||||
Node: The connection70816
|
||||
Node: The UDP tunnel71128
|
||||
Node: The meta-connection74189
|
||||
Node: The meta-protocol75658
|
||||
Node: Security80667
|
||||
Node: Authentication protocol81797
|
||||
Node: Encryption of network packets86801
|
||||
Node: Security issues88174
|
||||
Node: Platform specific information89791
|
||||
Node: Interface configuration90019
|
||||
Node: Routes92472
|
||||
Node: About us94388
|
||||
Node: Contact information94563
|
||||
Node: Authors94967
|
||||
Node: Concept Index95372
|
||||
|
||||
End Tag Table
|
||||
|
|
|
|||
|
|
@ -778,8 +778,23 @@ variable.
|
|||
This option may not work on all platforms.
|
||||
|
||||
@cindex Broadcast
|
||||
@item Broadcast = <yes | no> (yes) [experimental]
|
||||
When disabled, tinc will drop all broadcast and multicast packets, in both router and switch mode.
|
||||
@item Broadcast = <no | mst | direct> (mst) [experimental]
|
||||
This option selects the way broadcast packets are sent to other daemons.
|
||||
@emph{NOTE: all nodes in a VPN must use the same Broadcast mode, otherwise routing loops can form.}
|
||||
|
||||
@table @asis
|
||||
@item no
|
||||
Broadcast packets are never sent to other nodes.
|
||||
|
||||
@item mst
|
||||
Broadcast packets are sent and forwarded via the VPN's Minimum Spanning Tree.
|
||||
This ensures broadcast packets reach all nodes.
|
||||
|
||||
@item direct
|
||||
Broadcast packets are sent directly to all nodes that can be reached directly.
|
||||
Broadcast packets received from other nodes are never forwarded.
|
||||
If the IndirectData option is also set, broadcast packets will only be sent to nodes which we have a meta connection to.
|
||||
@end table
|
||||
|
||||
@cindex ConnectTo
|
||||
@item ConnectTo = <@var{name}>
|
||||
|
|
@ -993,6 +1008,11 @@ This only has effect when Mode is set to "switch".
|
|||
This is a symbolic name for this connection.
|
||||
The name should consist only of alfanumeric and underscore characters (a-z, A-Z, 0-9 and _).
|
||||
|
||||
If Name starts with a $, then the contents of the environment variable that follows will be used.
|
||||
In that case, invalid characters will be converted to underscores.
|
||||
If Name is $HOST, but no such environment variable exist,
|
||||
the hostname will be read using the gethostnname() system call.
|
||||
|
||||
@cindex PingInterval
|
||||
@item PingInterval = <@var{seconds}> (60)
|
||||
The number of seconds of inactivity that tinc will wait before sending a
|
||||
|
|
@ -1030,6 +1050,33 @@ specified in the configuration file.
|
|||
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.
|
||||
|
||||
@cindex Proxy
|
||||
@item Proxy = socks4 | socks4 | http | exec @var{...} [experimental]
|
||||
Use a proxy when making outgoing connections.
|
||||
The following proxy types are currently supported:
|
||||
|
||||
@table @asis
|
||||
@cindex socks4
|
||||
@item socks4 <@var{address}> <@var{port}> [<@var{username}>]
|
||||
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.
|
||||
|
||||
@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
|
||||
@item http <@var{address}> <@var{port}>
|
||||
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
|
||||
|
||||
@cindex ReplayWindow
|
||||
@item ReplayWindow = <bytes> (16)
|
||||
This is the size of the replay tracking window for each remote node, in bytes.
|
||||
|
|
@ -1162,12 +1209,11 @@ Multiple subnet lines can be specified for each daemon.
|
|||
Subnets can either be single MAC, IPv4 or IPv6 addresses,
|
||||
in which case a subnet consisting of only that single address is assumed,
|
||||
or they can be a IPv4 or IPv6 network address with a prefixlength.
|
||||
Shorthand notations are not supported.
|
||||
For example, IPv4 subnets must be in a form like 192.168.1.0/24,
|
||||
where 192.168.1.0 is the network address and 24 is the number of bits set in the netmask.
|
||||
Note that subnets like 192.168.1.1/24 are invalid!
|
||||
Read a networking HOWTO/FAQ/guide if you don't understand this.
|
||||
IPv6 subnets are notated like fec0:0:0:1:0:0:0:0/64.
|
||||
IPv6 subnets are notated like fec0:0:0:1::/64.
|
||||
MAC addresses are notated like 0:1a:2b:3c:4d:5e.
|
||||
|
||||
@cindex CIDR notation
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue