From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Sep 2018 12:01:12 +0000 (+0200)
Subject: ip-tunnel: Add support for VTI interfaces
X-Git-Tag: 010~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cab7afb0e96f683ca19e6ef53f539162a54c42c;p=network.git

ip-tunnel: Add support for VTI interfaces

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/hooks/zones/ip-tunnel b/src/hooks/zones/ip-tunnel
index 3179052b..43a9e712 100644
--- a/src/hooks/zones/ip-tunnel
+++ b/src/hooks/zones/ip-tunnel
@@ -21,9 +21,9 @@
 
 . /usr/lib/network/header-zone
 
-SUPPORTED_IP_TUNNEL_MODES="gre"
+SUPPORTED_IP_TUNNEL_MODES="gre vti"
 
-HOOK_SETTINGS="HOOK MODE PEER LOCAL_ADDRESS"
+HOOK_SETTINGS="HOOK MARK MODE PEER LOCAL_ADDRESS"
 
 # Default mode of the tunnel
 MODE="gre"
@@ -44,6 +44,11 @@ hook_check_settings() {
 		assert ip_is_valid "${LOCAL_ADDRESS}"
 		assert ip_protocol_match "${PEER}" "${LOCAL_ADDRESS}"
 	fi
+
+	# Generate a random mark
+	if ! isset MARK; then
+		MARK="$(( ${RANDOM} & 0xffffffff ))"
+	fi
 }
 
 hook_parse_cmdline() {
@@ -119,7 +124,9 @@ hook_up() {
 		ip_tunnel_add "${zone}" \
 			--mode="${MODE}" \
 			--remote-address="${PEER}" \
-			--local-address="${LOCAL_ADDRESS}"
+			--local-address="${LOCAL_ADDRESS}" \
+			--ikey="${MARK}" \
+			--okey="${MARK}"
 	fi
 
 	# Bring up the device