Commit e5b6b7a710 for strongswan.org

commit e5b6b7a710daa99212b1bf9062ccfb0213ad31ef
Author: Tobias Brunner <tobias@strongswan.org>
Date:   Wed Oct 21 19:40:55 2026 +0200

    configure: Define constants for routing table/priority in config.h

    This makes them easily available for other kernel plugins.

diff --git a/Android.mk b/Android.mk
index e8ac526865..f77bbdb856 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,8 +64,8 @@ strongswan_CFLAGS := \
 	-DUSE_IKEV2 \
 	-DUSE_BUILTIN_PRINTF \
 	-DDEBUG \
-	-DROUTING_TABLE=0 \
-	-DROUTING_TABLE_PRIO=220 \
+	-DIPSEC_ROUTING_TABLE=0 \
+	-DIPSEC_ROUTING_TABLE_PRIO=220 \
 	-DVERSION=\"$(strongswan_VERSION)\" \
 	-DPLUGINDIR=\"$(strongswan_PLUGINDIR)\" \
 	-DIPSEC_DIR=\"$(strongswan_DIR)\" \
diff --git a/configure.ac b/configure.ac
index 834c9027d9..abea999f5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,9 @@ ARG_WITH_SET([rubygemdir],           ["gem environment gemdir"], [path to instal
 ARG_WITH_SET([testable-ke],          [yes], [make key exchange implementations testable by providing a set_seed() method])
 ARG_WITH_SET([plugins-packaged-separately], [no], [changes e.g. log messages for distributions that package plugins separately])

+AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE, [$routing_table], [routing table for IPsec routes])
+AC_DEFINE_UNQUOTED(IPSEC_ROUTING_TABLE_PRIO, [$routing_table_prio], [priority for IPsec routing table])
+
 if test -n "$PKG_CONFIG"; then
 	systemdsystemunitdir_default=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
 fi
diff --git a/src/libcharon/plugins/kernel_netlink/Makefile.am b/src/libcharon/plugins/kernel_netlink/Makefile.am
index 3db1971420..29d21a92fb 100644
--- a/src/libcharon/plugins/kernel_netlink/Makefile.am
+++ b/src/libcharon/plugins/kernel_netlink/Makefile.am
@@ -1,9 +1,7 @@
 AM_CPPFLAGS = \
 	-I${linux_headers} \
 	-I$(top_srcdir)/src/libstrongswan \
-	-I$(top_srcdir)/src/libcharon \
-	-DROUTING_TABLE=${routing_table} \
-	-DROUTING_TABLE_PRIO=${routing_table_prio}
+	-I$(top_srcdir)/src/libcharon

 AM_CFLAGS = \
 	$(PLUGIN_CFLAGS)
diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
index 926d3d9040..bae7da136e 100644
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
@@ -71,14 +71,6 @@
 /** maximum recursion when searching for addresses in get_route() */
 #define MAX_ROUTE_RECURSION 2

-#ifndef ROUTING_TABLE
-#define ROUTING_TABLE 0
-#endif
-
-#ifndef ROUTING_TABLE_PRIO
-#define ROUTING_TABLE_PRIO 0
-#endif
-
 ENUM(rt_msg_names, RTM_NEWLINK, RTM_GETRULE,
 	"RTM_NEWLINK",
 	"RTM_DELLINK",
@@ -3105,9 +3097,9 @@ kernel_netlink_net_t *kernel_netlink_net_create()
 		.condvar = rwlock_condvar_create(),
 		.roam_lock = spinlock_create(),
 		.routing_table = lib->settings->get_int(lib->settings,
-						"%s.routing_table", ROUTING_TABLE, lib->ns),
+						"%s.routing_table", IPSEC_ROUTING_TABLE, lib->ns),
 		.routing_table_prio = lib->settings->get_int(lib->settings,
-						"%s.routing_table_prio", ROUTING_TABLE_PRIO, lib->ns),
+						"%s.routing_table_prio", IPSEC_ROUTING_TABLE_PRIO, lib->ns),
 		.process_route = lib->settings->get_bool(lib->settings,
 						"%s.process_route", TRUE, lib->ns),
 		.install_routes = lib->settings->get_bool(lib->settings,