From 7ec0dbe4a48ad0231fbc3b0962e822a530adb985 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 7 Mar 2016 15:57:00 +0100 Subject: [PATCH] iproute2: ip6gre: update man pages Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1013584 Upstream Status: iproute2.git commit 9abde37cde92e commit 9abde37cde92e9b84f2f72aad9a03635972ffdf3 Author: xeb@mail.ru Date: Tue Oct 1 11:18:34 2013 +0400 iproute2: ip6gre: update man pages Update man pages with ip6gre info. Signed-off-by: Dmitry Kozlov --- man/man8/ip-link.8.in | 124 +++++++++++++++++++++++++++++++++++++++++++++++++- man/man8/ip-tunnel.8 | 4 +- 2 files changed, 125 insertions(+), 3 deletions(-) diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 82ae316..81ef4bb 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -64,7 +64,11 @@ ip-link \- network device configuration .BR vxlan " |" .BR ip6tnl " |" .BR ipip " |" -.BR sit " ]" +.BR sit " |" +.BR gre " |" +.BR gretap " |" +.BR ip6gre " |" +.BR ip6gretap " ]" .ti -8 .BI "ip link delete " DEVICE @@ -196,6 +200,18 @@ Link types: .sp .BR sit - Virtual tunnel interface IPv6 over IPv4 +.sp +.BR gre +- Virtual tunnel interface GRE over IPv4 +.sp +.BR gretap +- Virtual L2 tuunel interface GRE over IPv4 +.sp +.BR ip6gre +- Virtual tuunel interface GRE over IPv6 +.sp +.BR ip6gretap +- Virtual L2 tuunel interface GRE over IPv6 .in -8 .TP @@ -443,6 +459,112 @@ Example: .in -8 +.TP +IP6GRE/IP6GRETAP Type Support +For a link of type +.I IP6GRE/IP6GRETAP +the following additional arguments are supported: + +.BI "ip link add " DEVICE +.BI type " { ip6gre | ip6gretap } " remote " ADDR " local " ADDR +.R " [ " +.I "[i|o]seq]" +.R " ] [ " +.I "[i|o]key" KEY +.R " ] [ " +.I " [i|o]csum " +.R " ] [ " +.BI hoplimit " TTL " +.R " ] [ " +.BI encaplimit " ELIM " +.R " ] [ " +.BI tclass " TCLASS " +.R " ] [ " +.BI flowlabel " FLOWLABEL " +.R " ] [ " +.BI "dscp inherit" +.R " ] [ " +.BI dev " PHYS_DEV " +.R " ]" + +.in +8 +.sp +.BI remote " ADDR " +- specifies the remote IPv6 address of the tunnel. + +.sp +.BI local " ADDR " +- specifies the fixed local IPv6 address for tunneled packets. +It must be and address on another interface on this host. + +.sp +.BI [i|o]seq +- serialize packets. +The +.B oseq +flag enables sequencing of outgoing packets. +The +.B iseq +flag requires that all input packets are serialized. + +.sp +.BI [i|o]key " KEY" +- use keyed GRE with key +.IR KEY ". "KEY +is either a number or an IPv4 address-like dotted quad. +The +.B key +parameter specifies the same key to use in both directions. +The +.BR ikey " and " okey +parameters specify different keys for input and output. + +.sp +.BI [i|o]csum +- generate/require checksums for tunneled packets. +The +.B ocsum +flag calculates checksums for outgoing packets. +The +.B icsum +flag requires that all input packets have the correct +checksum. The +.B csum +flag is equivalent to the combination +.BR "icsum ocsum" . + +.sp +.BI hoplimit " TTL" +- specifies Hop Limit value to use in outgoing packets. + +.sp +.BI encaplimit " ELIM" +- specifies a fixed encapsulation limit. Default is 4. + +.sp +.BI flowlabel " FLOWLABEL" +- specifies a fixed flowlabel. + +.sp +.BI tclass " TCLASS" +- specifies the traffic class field on +tunneled packets, which can be specified as either a two-digit +hex value (e.g. c0) or a predefined string (e.g. internet). +The value +.B inherit +causes the field to be copied from the original IP header. The +values +.BI "inherit/" STRING +or +.BI "inherit/" 00 ".." ff +will set the field to +.I STRING +or +.IR 00 ".." ff +when tunneling non-IP packets. The default value is 00. + +.in -8 + .SS ip link delete - delete virtual link .I DEVICE specifies the virtual device to act operate on. diff --git a/man/man8/ip-tunnel.8 b/man/man8/ip-tunnel.8 index f697b4f..c97c28c 100644 --- a/man/man8/ip-tunnel.8 +++ b/man/man8/ip-tunnel.8 @@ -50,7 +50,7 @@ ip-tunnel - tunnel configuration .ti -8 .IR MODE " := " -.RB " { " ipip " | " gre " | " sit " | " isatap " | " ip6ip6 " | " ipip6 " | " any " }" +.RB " { " ipip " | " gre " | " sit " | " isatap " | " ip6ip6 " | " ipip6 " | " ip6gre " | " any " }" .ti -8 .IR ADDR " := { " IP_ADDRESS " |" @@ -110,7 +110,7 @@ Modes for IPv4 encapsulation available: .BR ipip ", " sit ", " isatap " and " gre "." .br Modes for IPv6 encapsulation available: -.BR ip6ip6 ", " ipip6 " and " any "." +.BR ip6ip6 ", " ipip6 ", " ip6gre ", and " any "." .TP .BI remote " ADDRESS" -- 1.8.3.1