IPSEC: test for packet drop on sequence number wrap

[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 aa5562c..e682386 100644 (file)
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -177,28 +177,18 @@ format_ipsec_policy (u8 * s, va_list * args)
     {
       s = format (s, " sa %u", p->sa_id);
     }
-  if (p->is_ipv6)
-    {
-      s = format (s, "\n     local addr range %U - %U port range %u - %u",
-                 format_ip6_address, &p->laddr.start.ip6,
-                 format_ip6_address, &p->laddr.stop.ip6,
-                 p->lport.start, p->lport.stop);
-      s = format (s, "\n     remote addr range %U - %U port range %u - %u",
-                 format_ip6_address, &p->raddr.start.ip6,
-                 format_ip6_address, &p->raddr.stop.ip6,
-                 p->rport.start, p->rport.stop);
-    }
-  else
-    {
-      s = format (s, "\n     local addr range %U - %U port range %u - %u",
-                 format_ip4_address, &p->laddr.start.ip4,
-                 format_ip4_address, &p->laddr.stop.ip4,
-                 p->lport.start, p->lport.stop);
-      s = format (s, "\n     remote addr range %U - %U port range %u - %u",
-                 format_ip4_address, &p->raddr.start.ip4,
-                 format_ip4_address, &p->raddr.stop.ip4,
-                 p->rport.start, p->rport.stop);
-    }
+
+  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));
+  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));
+
   vlib_get_combined_counter (&ipsec_spd_policy_counters, pi, &counts);
   s = format (s, "\n     packets %u bytes %u", counts.packets, counts.bytes);
 
@@ -272,7 +262,8 @@ format_ipsec_sa (u8 * s, va_list * args)
              sa->udp_encap ? " udp-encap-enabled" : "",
              sa->use_anti_replay ? " anti-replay" : "",
              sa->use_esn ? " extended-sequence-number" : "");
-  s = format (s, "\n   last-seq %u last-seq-hi %u  window %U",
+  s = format (s, "\n   seq %u seq-hi %u", sa->seq, sa->seq_hi);
+  s = format (s, "\n   last-seq %u last-seq-hi %u window %U",
              sa->last_seq, sa->last_seq_hi,
              format_ipsec_replay_window, sa->replay_window);
   s = format (s, "\n   crypto alg %U%s%U",