From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 3 Mar 2025 08:46:14 +0000 (+0100)
Subject: Revert "kernel-netlink: Don't fallback to peer address as gateway"
X-Git-Tag: 6.0.1rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c1714ba124dfefad57605b3146a53416b23a87f;p=thirdparty%2Fstrongswan.git

Revert "kernel-netlink: Don't fallback to peer address as gateway"

This reverts commit f717bb5249caea550bc6e2baeb09ca309ad83b39.

Causes issues in our testing environment. Default route via host is
preferred if no gateway is set in the installed routes.  Needs some
investigation.

References strongswan/strongswan#2548
---

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
index 7d49d73b4f..416ae78116 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
@@ -2075,6 +2075,10 @@ static host_t *get_route(private_kernel_netlink_net_t *this, host_t *dest,
 				*iface = get_interface_name_by_index(this, best->oif);
 			}
 		}
+		if (!addr && !match_net)
+		{	/* fallback to destination address */
+			addr = dest->clone(dest);
+		}
 	}
 	else
 	{