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/plugins/dpdk/ipsec/esp_encrypt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/dpdk/ipsec') diff --git a/src/plugins/dpdk/ipsec/esp_encrypt.c b/src/plugins/dpdk/ipsec/esp_encrypt.c index 984bb64d1ef..f50291fcf2f 100644 --- a/src/plugins/dpdk/ipsec/esp_encrypt.c +++ b/src/plugins/dpdk/ipsec/esp_encrypt.c @@ -357,9 +357,9 @@ dpdk_esp_encrypt_inline (vlib_main_t * vm, clib_host_to_net_u32 (0xfe320000); oh0->ip4.src_address.as_u32 = - sa0->tunnel_src_addr.ip4.as_u32; + sa0->tunnel.t_src.ip.ip4.as_u32; oh0->ip4.dst_address.as_u32 = - sa0->tunnel_dst_addr.ip4.as_u32; + sa0->tunnel.t_dst.ip.ip4.as_u32; if (ipsec_sa_is_set_UDP_ENCAP (sa0)) { @@ -392,13 +392,13 @@ dpdk_esp_encrypt_inline (vlib_main_t * vm, oh6_0->ip6.protocol = IP_PROTOCOL_IPSEC_ESP; oh6_0->ip6.hop_limit = 254; oh6_0->ip6.src_address.as_u64[0] = - sa0->tunnel_src_addr.ip6.as_u64[0]; + sa0->tunnel.t_src.ip.ip6.as_u64[0]; oh6_0->ip6.src_address.as_u64[1] = - sa0->tunnel_src_addr.ip6.as_u64[1]; + sa0->tunnel.t_src.ip.ip6.as_u64[1]; oh6_0->ip6.dst_address.as_u64[0] = - sa0->tunnel_dst_addr.ip6.as_u64[0]; + sa0->tunnel.t_dst.ip.ip6.as_u64[0]; oh6_0->ip6.dst_address.as_u64[1] = - sa0->tunnel_dst_addr.ip6.as_u64[1]; + sa0->tunnel.t_dst.ip.ip6.as_u64[1]; esp0 = &oh6_0->esp; oh6_0->esp.spi = clib_host_to_net_u32 (sa0->spi); oh6_0->esp.seq = clib_host_to_net_u32 (sa0->seq); -- cgit 1.2.3-korg