Revert "ipsec: Use the new tunnel API types to add flow label and TTL copy"

[vpp.git] / src / vnet / ipsec / ipsec_input.c

diff --git a/src/vnet/ipsec/ipsec_input.c b/src/vnet/ipsec/ipsec_input.c
index 2ebc6c5..aa7627d 100644 (file)
--- 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;