From 2cab7afb0e96f683ca19e6ef53f539162a54c42c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Sep 2018 14:01:12 +0200 Subject: [PATCH] ip-tunnel: Add support for VTI interfaces Signed-off-by: Michael Tremer --- src/hooks/zones/ip-tunnel | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 -- 2.47.2