aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2019-03-28 08:59:12 +0000
committerNeale Ranns <nranns@cisco.com>2019-03-28 08:59:17 +0000
commit45d8f85daa2dfdc482beb5a8190fdfaecfeac089 (patch)
tree03115336287517522916ffe5ca179ad850ded077
parent7d3161adb56833e84c07eec4284b840255b5e3de (diff)
IPSEC: fix build breakage from ships in the night merges
Change-Id: Iec7da9adc970d005cd7d3d42839b5e51b0b5f5c3 Signed-off-by: Neale Ranns <nranns@cisco.com>
-rw-r--r--src/vnet/ipsec/ipsec_if.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/vnet/ipsec/ipsec_if.c b/src/vnet/ipsec/ipsec_if.c
index 304c52eac7c..af61178fbc8 100644
--- a/src/vnet/ipsec/ipsec_if.c
+++ b/src/vnet/ipsec/ipsec_if.c
@@ -69,11 +69,15 @@ ipsec_if_tunnel_stack (adj_index_t ai)
sa = ipsec_sa_get (it->output_sa_index);
+ /* *INDENT-OFF* */
fib_prefix_t pfx = {
.fp_addr = sa->tunnel_dst_addr,
- .fp_len = (sa->is_tunnel_ip6 ? 128 : 32),
- .fp_proto = (sa->is_tunnel_ip6 ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4),
+ .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),
};
+ /* *INDENT-ON* */
adj_midchain_delegate_stack (ai, sa->tx_fib_index, &pfx);
}