From c5fe57dac12a46fa618259643909afaec1ac5aae Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Thu, 25 Feb 2021 16:01:28 +0000 Subject: ipsec: move the IPSec SA pool out of ipsec_main Type: refactor this allows the ipsec_sa_get funtion to be moved from ipsec.h to ipsec_sa.h where it belongs. Also use ipsec_sa_get throughout the code base. Signed-off-by: Neale Ranns Change-Id: I2dce726c4f7052b5507dd8dcfead0ed5604357df --- src/vnet/ipsec/ipsec_format.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/vnet/ipsec/ipsec_format.c') diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index 001aa010364..b67c11da1cd 100644 --- a/src/vnet/ipsec/ipsec_format.c +++ b/src/vnet/ipsec/ipsec_format.c @@ -271,17 +271,16 @@ format_ipsec_sa (u8 * s, va_list * args) { u32 sai = va_arg (*args, u32); ipsec_format_flags_t flags = va_arg (*args, ipsec_format_flags_t); - ipsec_main_t *im = &ipsec_main; vlib_counter_t counts; ipsec_sa_t *sa; - if (pool_is_free_index (im->sad, sai)) + if (pool_is_free_index (ipsec_sa_pool, sai)) { s = format (s, "No such SA index: %d", sai); goto done; } - sa = pool_elt_at_index (im->sad, sai); + sa = ipsec_sa_get (sai); s = format (s, "[%d] sa %u (0x%x) spi %u (0x%08x) protocol:%s flags:[%U]", sai, sa->id, sa->id, sa->spi, sa->spi, -- cgit 1.2.3-korg