From c856b4ead2c4496b755e452b2dd4e98b4a72be7b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 18 Sep 2018 13:30:17 +0200
Subject: [PATCH] ipsec: Change mode to transport/tunnel only

VTI is being removed and will be possible via the new
zone command.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/bash-completion/network   |  2 +-
 src/functions/functions.ipsec | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/bash-completion/network b/src/bash-completion/network
index d19dcf27..15c78903 100644
--- a/src/bash-completion/network
+++ b/src/bash-completion/network
@@ -513,7 +513,7 @@ _network_vpn_ipsec_connection_subcommands_authentication_mode() {
 _network_vpn_ipsec_connection_subcommands_mode() {
 	local words=( $@ )
 
-	local commands="gre-transport tunnel vti"
+	local commands="transport tunnel"
 	local cmd="$(_network_find_on_cmdline "${commands}")"
 	if [[ -z "${cmd}" ]]; then
 		COMPREPLY=( $(compgen -W "${commands}" -- "${cur}") )
diff --git a/src/functions/functions.ipsec b/src/functions/functions.ipsec
index b7e09a4c..4e4c45da 100644
--- a/src/functions/functions.ipsec
+++ b/src/functions/functions.ipsec
@@ -52,7 +52,7 @@ IPSEC_DEFAULT_SECURITY_POLICY="system"
 IPSEC_DEFAULT_START_ACTION="on-demand"
 IPSEC_DEFAULT_TYPE="net-to-net"
 
-IPSEC_VALID_MODES="gre-transport tunnel vti"
+IPSEC_VALID_MODES="transport tunnel"
 IPSEC_VALID_AUTH_MODES="PSK"
 
 cli_ipsec() {
@@ -224,15 +224,12 @@ cli_ipsec_connection_show() {
 	cli_headline 2 "Misc."
 
 	case "${MODE}" in
-		gre-transport)
-			cli_print_fmt1 2 "Transport Mode" "GRE Transport"
+		transport)
+			cli_print_fmt1 2 "Transport Mode" "Transport"
 			;;
 		tunnel)
 			cli_print_fmt1 2 "Transport Mode" "Tunnel"
 			;;
-		vti)
-			cli_print_fmt1 2 "Transport Mode" "Virtual Tunnel Interface"
-			;;
 		*)
 			cli_print_fmt1 2 "Transport Mode" "- Unknown -"
 			;;
@@ -1492,12 +1489,15 @@ _ipsec_connection_to_strongswan_connection() {
 	# Mode
 	print_indent 4 "# Mode"
 	case "${MODE}" in
-		gre-transport)
+		transport)
 			print_indent 4 "mode = transport"
 			;;
-		tunnel|vti|*)
+		tunnel)
 			print_indent 4 "mode = tunnel"
 			;;
+		*)
+			log WARNING "Unsupported IPsec mode: ${mode}"
+			;;
 	esac
 	print
 
-- 
2.39.2