From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonatan Schlag To: network@lists.ipfire.org Subject: [PATCH 5/5] ip-tunnel: choose the correct type based on the ip protocol Date: Sun, 04 Mar 2018 18:24:59 +0000 Message-ID: <1520187899-5759-5-git-send-email-jonatan.schlag@ipfire.org> In-Reply-To: <1520187899-5759-1-git-send-email-jonatan.schlag@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4260908939535903817==" List-Id: --===============4260908939535903817== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable IPv4 and IPv6 need different types for iproute2. So in the _add function we have to determine the mode based on the IP protocol of the ${remote_address}. When we change ikey and okey we have to dertermine the mode the device have currently. Fixes: #11431 Signed-off-by: Jonatan Schlag --- src/functions/functions.ip-tunnel | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/functions/functions.ip-tunnel b/src/functions/functions.ip-t= unnel index 0a0c210..3baf280 100644 --- a/src/functions/functions.ip-tunnel +++ b/src/functions/functions.ip-tunnel @@ -150,6 +150,9 @@ ip_tunnel_add() { cmd_args=3D"${cmd_args} ikey ${ikey} okey ${okey}" fi =20 + # Determine the mode based on the IP protocol + mode=3D$(ip_tunnel_convert_mode_to_iproute2_mode "${mode}" "${remote_addres= s_protocol}") + log DEBUG "Creating tunnel device '${device}' (mode=3D${mode})..." =20 # Create the device. @@ -208,8 +211,16 @@ ip_tunnel_change_keys() { return ${EXIT_ERROR} fi =20 + # Determine the device type + local type=3D"$(device_tunnel_get_type ${device})" + + if ! isoneof "type" vti vti6; then + log ERROR "Device type '${type}' is invalid" + return ${EXIT_ERROR} + fi + if ! cmd ip link change dev "${device}" \ - type vti ikey "${ikey}" okey "${okey}"; then + type "${type}" ikey "${ikey}" okey "${okey}"; then log ERROR "Could not change keys of device ${device}" return ${EXIT_ERROR} fi --=20 2.6.3 --===============4260908939535903817==--