diff options
| -rw-r--r-- | docs/configexamples/dhcp-relay-through-gre-bridge.rst | 13 | ||||
| -rw-r--r-- | docs/configuration/interfaces/tunnel.rst | 15 | 
2 files changed, 24 insertions, 4 deletions
| diff --git a/docs/configexamples/dhcp-relay-through-gre-bridge.rst b/docs/configexamples/dhcp-relay-through-gre-bridge.rst index 0ebaa967..10184970 100644 --- a/docs/configexamples/dhcp-relay-through-gre-bridge.rst +++ b/docs/configexamples/dhcp-relay-through-gre-bridge.rst @@ -1,3 +1,8 @@ + + + + +  .. _examples-dhcp-relay-through-gre-bridge: @@ -24,8 +29,8 @@ DHCP Server     set interfaces loopback lo address '192.168.3.3/24'     set interfaces tunnel tun100 address '172.16.0.2/30'     set interfaces tunnel tun100 encapsulation 'gretap' -   set interfaces tunnel tun100 local-ip '10.0.2.1' -   set interfaces tunnel tun100 remote-ip '192.168.0.1' +   set interfaces tunnel tun100 source-address '10.0.2.1' +   set interfaces tunnel tun100 remote '192.168.0.1'     set protocols ospf area 0 network '192.168.3.0/24'     set protocols ospf area 0 network '10.0.2.0/24'     set protocols ospf parameters router-id '192.168.3.3' @@ -62,8 +67,8 @@ DHCP Relay     set interfaces loopback lo address '10.100.100.1'     set interfaces tunnel tun100 address '172.16.0.1/30'     set interfaces tunnel tun100 encapsulation 'gretap' -   set interfaces tunnel tun100 local-ip '192.168.0.1' -   set interfaces tunnel tun100 remote-ip '10.0.2.1' +   set interfaces tunnel tun100 source-address '192.168.0.1' +   set interfaces tunnel tun100 remote '10.0.2.1'     set protocols ospf area 0 network '10.0.1.0/24'     set protocols ospf area 0 network '192.168.0.0/24'     set protocols ospf area 0 network '10.100.100.0/24' diff --git a/docs/configuration/interfaces/tunnel.rst b/docs/configuration/interfaces/tunnel.rst index 36b1d70b..7f7cd709 100644 --- a/docs/configuration/interfaces/tunnel.rst +++ b/docs/configuration/interfaces/tunnel.rst @@ -201,6 +201,21 @@ An example:     set interfaces tunnel tun0 address 172.16.17.18/24     set interfaces tunnel tun0 parameters ip key 20 +GRETAP +^^^^^^^ + +While normal GRE is for layer 3, GRETAP is for layer 2. GRETAP can encapsulate +Ethernet frames, thus it can be bridged with other interfaces to create  +datalink layer segments that span multiple remote sites. + +.. code-block:: none + +   set interfaces bridge br0 member interface eth0 +   set interfaces bridge br0 member interface tun0 +   set interfaces tunnel tun0 encapsulation gretap +   set interfaces tunnel tun0 source-address 198.51.100.2 +   set interfaces tunnel tun0 remote 203.0.113.10 +  Troubleshooting  ^^^^^^^^^^^^^^^ | 
