|
 |
049c96 |
From 8db75397532ab61150a4c889337cdbacd0072d58 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Mon, 7 Mar 2016 20:44:16 +0100
|
|
|
049c96 |
Subject: [PATCH] add 'vti'/'vti6' tunnel modes to ip-tunnel manual page
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1251186
|
|
|
049c96 |
Upstream Status: iproute2.git commit 6eca32ec6fa68
|
|
|
049c96 |
|
|
|
049c96 |
commit 6eca32ec6fa682491bece81b91fd44de3de4afc4
|
|
|
049c96 |
Author: Konstantin Shemyak <konstantin@shemyak.com>
|
|
|
049c96 |
Date: Sat Aug 29 21:36:32 2015 +0300
|
|
|
049c96 |
|
|
|
049c96 |
add 'vti'/'vti6' tunnel modes to ip-tunnel manual page
|
|
|
049c96 |
|
|
|
049c96 |
* "vti" and "vti6" tunnel modes added to ip-tunnel.8 manual page
|
|
|
049c96 |
* Added "hoplimit" terminology for IPv6
|
|
|
049c96 |
* Corrected usage line
|
|
|
049c96 |
* Minor language fix
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/ip-tunnel.8 | 24 ++++++++++++------------
|
|
|
049c96 |
1 file changed, 12 insertions(+), 12 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/ip-tunnel.8 b/man/man8/ip-tunnel.8
|
|
|
049c96 |
index c97c28c..8b746cb 100644
|
|
|
049c96 |
--- a/man/man8/ip-tunnel.8
|
|
|
049c96 |
+++ b/man/man8/ip-tunnel.8
|
|
|
049c96 |
@@ -6,14 +6,12 @@ ip-tunnel - tunnel configuration
|
|
|
049c96 |
.ad l
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.B ip
|
|
|
049c96 |
-.RI "[ " OPTIONS " ]"
|
|
|
049c96 |
-.B tunnel
|
|
|
049c96 |
-.RI " { " COMMAND " | "
|
|
|
049c96 |
-.BR help " }"
|
|
|
049c96 |
+.B ip tunnel help
|
|
|
049c96 |
.sp
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.BR "ip tunnel" " { " add " | " change " | " del " | " show " | " prl " }"
|
|
|
049c96 |
+.BR "ip "
|
|
|
049c96 |
+.RI "[ " OPTIONS " ]"
|
|
|
049c96 |
+.BR "tunnel" " { " add " | " change " | " del " | " show " | " prl " }"
|
|
|
049c96 |
.RI "[ " NAME " ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " mode
|
|
|
049c96 |
@@ -29,7 +27,7 @@ ip-tunnel - tunnel configuration
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " encaplimit
|
|
|
049c96 |
.IR ELIM " ]"
|
|
|
049c96 |
-.RB "[ " ttl
|
|
|
049c96 |
+.RB "[ " ttl "|" hoplimit
|
|
|
049c96 |
.IR TTL " ]"
|
|
|
049c96 |
.br
|
|
|
049c96 |
.RB "[ " tos
|
|
|
049c96 |
@@ -50,7 +48,7 @@ ip-tunnel - tunnel configuration
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.IR MODE " := "
|
|
|
049c96 |
-.RB " { " ipip " | " gre " | " sit " | " isatap " | " ip6ip6 " | " ipip6 " | " ip6gre " | " any " }"
|
|
|
049c96 |
+.RB " { " ipip " | " gre " | " sit " | " isatap " | " vti " | " ip6ip6 " | " ipip6 " | " ip6gre " | " vti6 " | " any " }"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.IR ADDR " := { " IP_ADDRESS " |"
|
|
|
049c96 |
@@ -107,10 +105,10 @@ select the tunnel device name.
|
|
|
049c96 |
set the tunnel mode. Available modes depend on the encapsulating address family.
|
|
|
049c96 |
.br
|
|
|
049c96 |
Modes for IPv4 encapsulation available:
|
|
|
049c96 |
-.BR ipip ", " sit ", " isatap " and " gre "."
|
|
|
049c96 |
+.BR ipip ", " sit ", " isatap ", " vti ", and " gre "."
|
|
|
049c96 |
.br
|
|
|
049c96 |
Modes for IPv6 encapsulation available:
|
|
|
049c96 |
-.BR ip6ip6 ", " ipip6 ", " ip6gre ", and " any "."
|
|
|
049c96 |
+.BR ip6ip6 ", " ipip6 ", " ip6gre ", " vti6 ", and " any "."
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
.BI remote " ADDRESS"
|
|
|
049c96 |
@@ -123,7 +121,9 @@ It must be an address on another interface of this host.
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
.BI ttl " N"
|
|
|
049c96 |
-set a fixed TTL
|
|
|
049c96 |
+.TP
|
|
|
049c96 |
+.BI hoplimit " N"
|
|
|
049c96 |
+set a fixed TTL (IPv4) or hoplimit (IPv6)
|
|
|
049c96 |
.I N
|
|
|
049c96 |
on tunneled packets.
|
|
|
049c96 |
.I N
|
|
|
049c96 |
@@ -218,7 +218,7 @@ The
|
|
|
049c96 |
.B seq
|
|
|
049c96 |
flag is equivalent to the combination
|
|
|
049c96 |
.BR "iseq oseq" .
|
|
|
049c96 |
-.B It isn't work. Don't use it.
|
|
|
049c96 |
+.B It doesn't work. Don't use it.
|
|
|
049c96 |
|
|
|
049c96 |
.TP
|
|
|
049c96 |
.BI encaplim " ELIM"
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|