kernel-pfkey: Prefer policies with reqid over those without

diff --git a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
index 0e2e7df4852534c3b04e485cdba9fba9b63b30f4..7eb6c580848fb4cbfefbb3f5dc036977852e47c5 100644 (file)
--- a/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+++ b/src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
@@ -2598,7 +2598,13 @@ METHOD(kernel_ipsec_t, add_policy, status_t,
        enumerator = policy->used_by->create_enumerator(policy->used_by);
        while (enumerator->enumerate(enumerator, (void**)&current_sa))
        {
-               if (current_sa->priority >= assigned_sa->priority)
+               if (current_sa->priority > assigned_sa->priority)
+               {
+                       break;
+               }
+               /* prefer SAs with a reqid over those without */
+               if (current_sa->priority == assigned_sa->priority &&
+                       (!current_sa->sa->cfg.reqid || assigned_sa->sa->cfg.reqid))
                {
                        break;
                }