diff options
| author |   Neale Ranns <nranns@cisco.com> | 2019-07-10 13:46:21 +0000 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2019-07-11 20:02:37 +0000 |
| commit | f699d128bf83726ac13629ef0979a21af8149fc1 (patch) | |
| tree | 1ef855caa239bfabda004225a6d1bf22efe47c5d /src/vnet/ipsec/ipsec_format.c | |
| parent | 649f9360c471daa3210b41b4f261d2fe1a8bc1e0 (diff) | |
ipsec: Revert "IPSEC: remove byte swap operations in DP during SPD classify"
Type: fix
Fixes: 231c4696872cb344f28648949603840136c0795d
This reverts commit 231c4696872cb344f28648949603840136c0795d.
Change-Id: I136344555983dd10a31dbc000ee40e2de2c91291
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'src/vnet/ipsec/ipsec_format.c')
| -rw-r--r-- | src/vnet/ipsec/ipsec_format.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index 80691f2836c..7bda5203a55 100644 --- a/src/vnet/ipsec/ipsec_format.c +++ b/src/vnet/ipsec/ipsec_format.c @@ -158,6 +158,7 @@ format_ipsec_policy (u8 * s, va_list * args) ipsec_main_t *im = &ipsec_main; ipsec_policy_t *p; vlib_counter_t counts; + ip46_type_t ip_type; p = pool_elt_at_index (im->policies, pi); @@ -177,17 +178,19 @@ format_ipsec_policy (u8 * s, va_list * args) { s = format (s, " sa %u", p->sa_id); } + if (p->is_ipv6) + { + ip_type = IP46_TYPE_IP6; + } s = format (s, "\n local addr range %U - %U port range %u - %u", - format_ip46_address, &p->laddr.start, IP46_TYPE_ANY, - format_ip46_address, &p->laddr.stop, IP46_TYPE_ANY, - clib_net_to_host_u16 (p->lport.start), - clib_net_to_host_u16 (p->lport.stop)); + format_ip46_address, &p->laddr.start, ip_type, + format_ip46_address, &p->laddr.stop, ip_type, + p->lport.start, p->lport.stop); s = format (s, "\n remote addr range %U - %U port range %u - %u", - format_ip46_address, &p->raddr.start, IP46_TYPE_ANY, - format_ip46_address, &p->raddr.stop, IP46_TYPE_ANY, - clib_net_to_host_u16 (p->rport.start), - clib_net_to_host_u16 (p->rport.stop)); + format_ip46_address, &p->raddr.start, ip_type, + format_ip46_address, &p->raddr.stop, ip_type, + p->rport.start, p->rport.stop); vlib_get_combined_counter (&ipsec_spd_policy_counters, pi, &counts); s = format (s, "\n packets %u bytes %u", counts.packets, counts.bytes); |