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