diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-06-07 19:36:07 +0200 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-06-20 15:36:56 +0000 |
| commit | ee52d877d41a6349c1090f62fb2948f90e6301ce (patch) | |
| tree | 2d9c201e4134c693a6ed88b94bc5385085d043fd /src/vnet/ipsec/ipsec.c | |
| parent | 22f9fb1286d2469819cfcef68ffdc258f4d52c24 (diff) | |
ipsec: VPP-1308 fix sorting of SPD entries
Change-Id: I761aced55b7cef51a9b47048283b2cb9430bcde2
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'src/vnet/ipsec/ipsec.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index 928cafd5e25..73b51012880 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -135,20 +135,15 @@ ipsec_add_del_spd (vlib_main_t * vm, u32 spd_id, int is_add) static int ipsec_spd_entry_sort (void *a1, void *a2) { - ipsec_main_t *im = &ipsec_main; u32 *id1 = a1; u32 *id2 = a2; - ipsec_spd_t *spd; + ipsec_spd_t *spd = ipsec_main.spd_to_sort; ipsec_policy_t *p1, *p2; - /* *INDENT-OFF* */ - pool_foreach (spd, im->spds, ({ - p1 = pool_elt_at_index(spd->policies, *id1); - p2 = pool_elt_at_index(spd->policies, *id2); - if (p1 && p2) - return p2->priority - p1->priority; - })); - /* *INDENT-ON* */ + p1 = pool_elt_at_index (spd->policies, *id1); + p2 = pool_elt_at_index (spd->policies, *id2); + if (p1 && p2) + return p2->priority - p1->priority; return 0; } @@ -191,6 +186,8 @@ ipsec_add_del_policy (vlib_main_t * vm, ipsec_policy_t * policy, int is_add) clib_memcpy (vp, policy, sizeof (*vp)); policy_index = vp - spd->policies; + ipsec_main.spd_to_sort = spd; + if (policy->is_outbound) { if (policy->is_ipv6) @@ -256,6 +253,7 @@ ipsec_add_del_policy (vlib_main_t * vm, ipsec_policy_t * policy, int is_add) } } + ipsec_main.spd_to_sort = NULL; } else { |