kernel-netlink: Don't install routes for CHILD_SAs with interface ID

diff --git a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
index 205e772ae26f42991e4f9bacfd5850bb648dab55..27bb3792dd7195d2ad4d462f3684ebe31b32fc8b 100644 (file)
--- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
+++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c
@@ -2846,10 +2846,12 @@ static status_t add_policy_internal(private_kernel_netlink_ipsec_t *this,
         * - this is an outbound policy (to just get one for each child)
         * - routing is not disabled via strongswan.conf
         * - the selector is not for a specific protocol/port
+        * - no XFRM interface ID is configured
         * - we are in tunnel/BEET mode or install a bypass policy
         */
        if (policy->direction == POLICY_OUT && this->install_routes &&
-               !policy->sel.proto && !policy->sel.dport && !policy->sel.sport)
+               !policy->sel.proto && !policy->sel.dport && !policy->sel.sport &&
+               !policy->if_id)
        {
                if (mapping->type == POLICY_PASS ||
                   (mapping->type == POLICY_IPSEC && ipsec->cfg.mode != MODE_TRANSPORT))

diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
index 3f27fee55cd16e66283a422e76c7f90391089080..c02c5743ad448d66ef683e84037a08be9de6d616 100644 (file)
--- a/src/swanctl/swanctl.opt
+++ b/src/swanctl/swanctl.opt
@@ -934,6 +934,8 @@ connections.<conn>.children.<child>.if_id_out = 0
        instance, beyond that the value _%unique-dir_ assigns a different unique
        interface ID for each CHILD_SA direction (in/out).
 
+       The daemon will not install routes for CHILD_SAs that have this option set.
+
 connections.<conn>.children.<child>.set_mark_in = 0/0x00000000
        Netfilter mark applied to packets after the inbound IPsec SA processed them.