From 54bac01402419bf109be43be8832f2a064af3baf Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 9 Jan 2019 19:52:46 +0100
Subject: [PATCH] ipsec: Find correct RED IP address when using %defaultroute

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/scripts/ipsec-interfaces | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/scripts/ipsec-interfaces b/src/scripts/ipsec-interfaces
index 4ba2980e57..521bf54eb1 100644
--- a/src/scripts/ipsec-interfaces
+++ b/src/scripts/ipsec-interfaces
@@ -23,6 +23,7 @@ shopt -s nullglob
 
 VPN_CONFIG="/var/ipfire/vpn/config"
 
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/vpn/settings)
 
 VARS=(
@@ -42,6 +43,20 @@ main() {
 	local action
 
 	local interfaces=()
+	local vpn_ip
+
+	# Handle %defaultroute
+	if [ "${VPN_IP}" = "%defaultroute" ]; then
+		if [ -r "/var/ipfire/red/local-ipaddress" ]; then
+			vpn_ip="$(</var/ipfire/red/local-ipaddress)"
+
+		elif [ "${RED_TYPE}" = "STATIC" -a -n "${RED_ADDRESS}" ]; then
+			vpn_ip="${RED_ADDRESS}"
+
+		fi
+	else
+		vpn_ip="${VPM_IP}"
+	fi
 
 	# We are done when IPsec is not enabled
 	if [ "${ENABLED}" = "on" ]; then
@@ -66,7 +81,7 @@ main() {
 			interfaces+=( "${intf}" )
 
 			local args=(
-				"local" "${VPN_IP}"
+				"local" "${vpn_ip}"
 				"remote" "${righthost}"
 				"ttl" "255"
 			)
-- 
2.39.2