summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-01-09 20:51:01 +0100
committerChristian Poessinger <christian@poessinger.com>2021-01-09 20:51:01 +0100
commit1a89ce7c329a6bc3addc553b57ae2ff2d40cba96 (patch)
tree01b90ef7e5a2f0b6f1cc1ca85598e99456ce31c1 /docs
parente9a0b934175a89ce4998e2157e5ba98ffa016665 (diff)
parent90ad8ca92e4c9cffab78a8d748243ea8ea11e270 (diff)
downloadvyos-documentation-1a89ce7c329a6bc3addc553b57ae2ff2d40cba96.tar.gz
vyos-documentation-1a89ce7c329a6bc3addc553b57ae2ff2d40cba96.zip
Merge branch 'owen-01' of https://github.com/owendelong/vyos-documentation
* 'owen-01' of https://github.com/owendelong/vyos-documentation: Fixed line lenghts Integrated documentation of ip6gre into gre and added a corresponding configuration example
Diffstat (limited to 'docs')
-rw-r--r--docs/configuration/interfaces/tunnel.rst13
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst
index 088d1820..d2d63ce2 100644
--- a/docs/configuration/interfaces/tunnel.rst
+++ b/docs/configuration/interfaces/tunnel.rst
@@ -101,8 +101,9 @@ Generic Routing Encapsulation (GRE)
A GRE tunnel operates at layer 3 of the OSI model and is repsented by IP
protocol 47.The main benefit of a GRE tunnel is that you are able to carry
-multiple protocols inside the same tunnel. GRE also supports multicast traffic and
-supports routing protocols that leverage multicast to form neighbor adjacencies.
+multiple protocols inside the same tunnel. GRE also supports multicast traffic
+and supports routing protocols that leverage multicast to form neighbor
+adjacencies.
A VyOS GRE tunnel can carry both IPv4 and IPv6 traffic and can also be created
over either IPv4 (gre) or IPv6 (ip6gre).
@@ -113,10 +114,10 @@ Configuration
A basic configuration requires a tunnel source (local-ip), a tunnel destination
(remote-ip), an encapsulation type (gre), and an address (ipv4/ipv6).Below is a
-basic IPv4 only configuration example taken from a VyOS router and a Cisco IOS router.
-The main difference between these two configurations is that VyOS requires you
-explicitly configure the encapsulation type. The Cisco router defaults to gre
-ip otherwise it would have to be configured as well.
+basic IPv4 only configuration example taken from a VyOS router and a Cisco IOS
+router. The main difference between these two configurations is that VyOS
+requires you explicitly configure the encapsulation type. The Cisco router
+defaults to gre ip otherwise it would have to be configured as well.
**VyOS Router:**