From 9ec846c2684b69f47505d73ea9f873b793a11558 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 9 Feb 2021 14:04:02 +0000 Subject: ipsec: Use the new tunnel API types to add flow label and TTL copy support Type: feature attmpet 2. this includes changes in ah_encrypt that don't use uninitialised memory when doing tunnel mode fixups. Signed-off-by: Neale Ranns Change-Id: Ie3cb776f5c415c93b8a5ee22f22586fd0181110d --- src/vnet/ipsec/ipsec_itf.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/vnet/ipsec/ipsec_itf.c') diff --git a/src/vnet/ipsec/ipsec_itf.c b/src/vnet/ipsec/ipsec_itf.c index 4a0f9e7bb6c..5f04fcf0a04 100644 --- a/src/vnet/ipsec/ipsec_itf.c +++ b/src/vnet/ipsec/ipsec_itf.c @@ -70,20 +70,11 @@ ipsec_itf_adj_stack (adj_index_t ai, u32 sai) if (hw->flags & VNET_HW_INTERFACE_FLAG_LINK_UP) { const ipsec_sa_t *sa; + fib_prefix_t dst; sa = ipsec_sa_get (sai); - - /* *INDENT-OFF* */ - const fib_prefix_t dst = { - .fp_len = (ipsec_sa_is_set_IS_TUNNEL_V6(sa) ? 128 : 32), - .fp_proto = (ipsec_sa_is_set_IS_TUNNEL_V6(sa)? - FIB_PROTOCOL_IP6 : - FIB_PROTOCOL_IP4), - .fp_addr = sa->tunnel_dst_addr, - }; - /* *INDENT-ON* */ - - adj_midchain_delegate_stack (ai, sa->tx_fib_index, &dst); + ip_address_to_fib_prefix (&sa->tunnel.t_dst, &dst); + adj_midchain_delegate_stack (ai, sa->tunnel.t_fib_index, &dst); } else adj_midchain_delegate_unstack (ai); -- cgit 1.2.3-korg