svc/conntrack.in: Update NetworkManager protocol handling.

[tripe] / svc / tripe-ifup.8.in

diff --git a/svc/tripe-ifup.8.in b/svc/tripe-ifup.8.in
index 0fe89d8..2b50041 100644 (file)
--- a/svc/tripe-ifup.8.in
+++ b/svc/tripe-ifup.8.in
@@ -101,36 +101,43 @@ a
 command is issued to keep the server informed.  Further configuration is
 performed using the new interface name.
 .hP 2.
 command is issued to keep the server informed.  Further configuration is
 performed using the new interface name.
 .hP 2.

-The point-to-point interface is configured.  If
+Configure the interface addresses.  If

 .I laddr
 .I laddr

-and
+is set, it should be a space-separated list of IPv4 and IPv6 addresses
+with optional prefix lengths; there may be any number of either.  If

 .I raddr
 .I raddr

-are set, then the interface is configured to be a point-to-point link
-from
-.I laddr
-to
-.IR raddr .
-Both are expected to be network addresses in dotted-quad form.  The
-interface MTU is configured based on the path MTU to the peer's external
-address and the cryptographic algorithms in use by the
-.BR tripe (8)
-server; this can be overridden by setting the
-.I mtu
-key.
+is set, it should be a list IPv4 and/or an IPv6 addresses, with optional
+prefix lengths, separated by space: these are the addresses to
+configure as the remote end point of the point-to-point link.  (Further
+remote addresses can be configured as host routes: see below.)  IPv4
+addresses are expected to be in dotted-quad form; IPv6 addresses should
+be in RFC4291 hex-and-colons form.

 .hP 3.
 .hP 3.

-Establish routes.  If the interface was configured, and
+Establish routes.  If addresses were configured, and

 .I nets
 is set, then
 .I nets
 is split into space-separated networks.  For each network, of the form
 .IB address / mask \fR,
 a route is configured to the given network, via the remote address of
 .I nets
 is set, then
 .I nets
 is split into space-separated networks.  For each network, of the form
 .IB address / mask \fR,
 a route is configured to the given network, via the remote address of

-the link, over the tunnel interface.
+the link, over the tunnel interface.  The
+.IR address es
+may be IPv4 or IPv6 addresses.  If the interface has only an IPv4
+address then IPv6 routes will be ignored, and
+.IR "vice versa" .

 .hP 4.
 .hP 4.

+Configure the interface MTU and bring it up.  The
+interface MTU is configured based on the path MTU to the peer's external
+address and the cryptographic algorithms in use by the
+.BR tripe (8)
+server; this can be overridden by setting the
+.I mtu
+key.
+.hP 5.

 Invoke user hook.  If
 .I ifupextra
 is set, it is interpreted as a Bourne shell command and evaluated.
 Invoke user hook.  If
 .I ifupextra
 is set, it is interpreted as a Bourne shell command and evaluated.

-.hP 5.
+.hP 6.

 Notify services.  A notification
 .RS
 .IP
 Notify services.  A notification
 .RS
 .IP