diff options
| author |   Matthew Smith <mgsmith@netgate.com> | 2021-02-08 22:13:59 +0000 |
|---|---|---|
| committer | Matthew Smith <mgsmith@netgate.com> | 2021-02-09 04:18:37 +0000 |
| commit | 751bb131ef504b64fe82f393df21dba95ca92e97 (patch) | |
| tree | 46e567343cb71124297aacb1a0b405b95f392bab /src/vnet/ipsec/ipsec_input.c | |
| parent | a8f4ebd08e6d7fddf6fca4f2ef7081321c51a451 (diff) | |
Revert "ipsec: Use the new tunnel API types to add flow label and TTL copy"
This reverts commit c7eaa711f3e25580687df0618e9ca80d3dc85e5f.
Reason for revert: The jenkins job named 'vpp-merge-master-ubuntu1804-x86_64' had 2 IPv6 AH tests fail after the change was merged. Those 2 tests also failed the next time that job ran after an unrelated change was merged.
Change-Id: I0e2c3ee895114029066c82624e79807af575b6c0
Signed-off-by: Matthew Smith <mgsmith@netgate.com>
Diffstat (limited to 'src/vnet/ipsec/ipsec_input.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec_input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c index 2ebc6c5a10c..aa7627d9b4b 100644 --- a/src/vnet/ipsec/ipsec_input.c +++ b/src/vnet/ipsec/ipsec_input.c @@ -118,10 +118,10 @@ ipsec_input_protect_policy_match (ipsec_spd_t * spd, u32 sa, u32 da, u32 spi) if (ipsec_sa_is_set_IS_TUNNEL (s)) { - if (da != clib_net_to_host_u32 (s->tunnel.t_dst.ip.ip4.as_u32)) + if (da != clib_net_to_host_u32 (s->tunnel_dst_addr.ip4.as_u32)) continue; - if (sa != clib_net_to_host_u32 (s->tunnel.t_src.ip.ip4.as_u32)) + if (sa != clib_net_to_host_u32 (s->tunnel_src_addr.ip4.as_u32)) continue; return p; @@ -174,10 +174,10 @@ ipsec6_input_protect_policy_match (ipsec_spd_t * spd, if (ipsec_sa_is_set_IS_TUNNEL (s)) { - if (!ip6_address_is_equal (sa, &s->tunnel.t_src.ip.ip6)) + if (!ip6_address_is_equal (sa, &s->tunnel_src_addr.ip6)) continue; - if (!ip6_address_is_equal (da, &s->tunnel.t_dst.ip.ip6)) + if (!ip6_address_is_equal (da, &s->tunnel_dst_addr.ip6)) continue; return p; |