summaryrefslogtreecommitdiff
path: root/docs/interfaces/tunnel.rst
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-09-19 03:02:46 +0700
committerGitHub <noreply@github.com>2019-09-19 03:02:46 +0700
commitbf0a3006078255676abd109cb4b12f40fe35635a (patch)
tree2e6d663d5a47782d1825a3ed61ce0cd4f99f9985 /docs/interfaces/tunnel.rst
parent3d08a03c5d1b0903e6bc40abe297e686ba6423d4 (diff)
parentbf3eeb0ab548c88f79103e5b2cb88639648368df (diff)
downloadvyos-documentation-bf0a3006078255676abd109cb4b12f40fe35635a.tar.gz
vyos-documentation-bf0a3006078255676abd109cb4b12f40fe35635a.zip
Merge pull request #113 from kroy-the-rabbit/master
Spelling, a few minor rewrites.
Diffstat (limited to 'docs/interfaces/tunnel.rst')
-rw-r--r--docs/interfaces/tunnel.rst10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/interfaces/tunnel.rst b/docs/interfaces/tunnel.rst
index f466a714..7103e5a2 100644
--- a/docs/interfaces/tunnel.rst
+++ b/docs/interfaces/tunnel.rst
@@ -13,8 +13,8 @@ All those protocols are grouped under 'interfaces tunnel' in VyOS. Let's take a
IPIP
----
-This is the simplest tunneling protocol in existence. It is defined by RFC2003_.
-It simply takes an IPv4 packet and sends it as a payload of another IPv4 packet. For this reason it doesn't really have any configuration options by itself.
+This is one of the simplest types of tunnels, as defined by RFC2003_.
+It takes an IPv4 packet and sends it as a payload of another IPv4 packet. For this reason, there are no other configuration options for this kind of tunnel.
An example:
@@ -64,7 +64,7 @@ An example:
6in4 uses tunneling to encapsulate IPv6 traffic over IPv4 links as defined in RFC4213_.
The 6in4 traffic is sent over IPv4 inside IPv4 packets whose IP headers have the IP protocol number set to 41.
This protocol number is specifically designated for IPv6 encapsulation, the IPv4 packet header is immediately followed by the IPv6 packet being carried.
-qThe encapsulation overhead is the size of the IPv4 header of 20 bytes, therefore with an MTU of 1500 bytes, IPv6 packets of 1480 bytes can be sent without fragmentation. This tunneling technique is frequently used by IPv6 tunnel brokers like `Hurricane Electric`_.
+The encapsulation overhead is the size of the IPv4 header of 20 bytes, therefore with an MTU of 1500 bytes, IPv6 packets of 1480 bytes can be sent without fragmentation. This tunneling technique is frequently used by IPv6 tunnel brokers like `Hurricane Electric`_.
An example:
@@ -75,6 +75,8 @@ An example:
set interfaces tunnel tun0 remote-ip 192.0.2.20
set interfaces tunnel tun0 address 2001:db8:bb::1/64
+A full example of a Tunnelbroker.net config can be found at :ref:`here <examples-tunnelbroker-ipv6>`.
+
Generic Routing Encapsulation (GRE)
-----------------------------------
@@ -191,4 +193,4 @@ Results in:
.. _RFC2473: https://tools.ietf.org/html/rfc2473
.. _`other proposals`: https://www.isc.org/downloads/aftr
.. _RFC4213: https://tools.ietf.org/html/rfc4213
-.. _`Hurricane Electric`: https://tunnelbroker.net/ \ No newline at end of file
+.. _`Hurricane Electric`: https://tunnelbroker.net/