ipsec: Revert "IPSEC: remove byte swap operations in DP during SPD classify"

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

diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c
index 80691f2..7bda520 100644 (file)
--- 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);