From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 4 Aug 2017 19:10:23 +0000 (+0000)
Subject: ipsec: GRE: Use outer IP addresses for peering
X-Git-Tag: 009~55
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fnetwork.git;a=commitdiff_plain;h=b1b6f6c8ec8928c05a87fdf60edcd7a8c9e95d84

ipsec: GRE: Use outer IP addresses for peering

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

diff --git a/src/helpers/ipsec-updown b/src/helpers/ipsec-updown
index eb5fc210..4ef3e88f 100644
--- a/src/helpers/ipsec-updown
+++ b/src/helpers/ipsec-updown
@@ -48,8 +48,8 @@ case "${PLUTO_VERB}" in
 				if ! device_exists "${INTERFACE}"; then
 					ip_tunnel_add "${INTERFACE}" \
 						--mode="gre" \
-						--local-address="${TUNNEL_ADDRESS}" \
-						--remote-address="${TUNNEL_PEER}"
+						--local-address="${PLUTO_ME}" \
+						--remote-address="${PLUTO_PEER}"
 
 					device_set_up "${INTERFACE}"
 				fi
@@ -78,7 +78,7 @@ case "${PLUTO_VERB}" in
 
 	down-client|down-client-v6|down-host|down-host-v6)
 		case "${MODE}" in
-			vti)
+			gre-*|vti)
 				if device_exists "${INTERFACE}"; then
 					device_set_down "${INTERFACE}"