ipsec: USE_EXTENDED_SEQ_NUM -> USE_ESN

[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 04a2a0b..dd99f78 100644 (file)
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -41,6 +41,24 @@ format_ipsec_policy_action (u8 * s, va_list * args)
   return s;
 }
 
+u8 *
+format_ipsec_policy_type (u8 * s, va_list * args)
+{
+  u32 i = va_arg (*args, u32);
+  char *t = 0;
+
+  switch (i)
+    {
+#define _(f,str) case IPSEC_SPD_POLICY_##f: t = str; break;
+      foreach_ipsec_spd_policy_type
+#undef _
+    default:
+      s = format (s, "unknown");
+    }
+  s = format (s, "%s", t);
+  return s;
+}
+
 uword
 unformat_ipsec_policy_action (unformat_input_t * input, va_list * args)
 {
@@ -143,8 +161,10 @@ format_ipsec_policy (u8 * s, va_list * args)
 
   p = pool_elt_at_index (im->policies, pi);
 
-  s = format (s, "  [%d] priority %d action %U protocol ",
-             pi, p->priority, format_ipsec_policy_action, p->policy);
+  s = format (s, "  [%d] priority %d action %U type %U protocol ",
+             pi, p->priority,
+             format_ipsec_policy_action, p->policy,
+             format_ipsec_policy_type, p->type);
   if (p->protocol)
     {
       s = format (s, "%U", format_ip_protocol, p->protocol);
@@ -157,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);
 
@@ -238,20 +248,23 @@ format_ipsec_sa (u8 * s, va_list * args)
 {
   u32 sai = va_arg (*args, u32);
   ipsec_main_t *im = &ipsec_main;
+  vlib_counter_t counts;
   u32 tx_table_id;
   ipsec_sa_t *sa;
 
   sa = pool_elt_at_index (im->sad, sai);
 
-  s = format (s, "[%d] sa %u spi %u mode %s%s protocol %s%s%s%s",
+  s = format (s, "[%d] sa 0x%x spi %u mode %s%s protocol %s%s%s%s",
              sai, sa->id, sa->spi,
-             sa->is_tunnel ? "tunnel" : "transport",
-             sa->is_tunnel_ip6 ? "-ip6" : "",
+             ipsec_sa_is_set_IS_TUNNEL (sa) ? "tunnel" : "transport",
+             ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? "-ip6" : "",
              sa->protocol ? "esp" : "ah",
-             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",
+             ipsec_sa_is_set_UDP_ENCAP (sa) ? " udp-encap-enabled" : "",
+             ipsec_sa_is_set_USE_ANTI_REPLAY (sa) ? " anti-replay" : "",
+             ipsec_sa_is_set_USE_ESN (sa) ?
+             " extended-sequence-number" : "");
+  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",
@@ -261,8 +274,10 @@ format_ipsec_sa (u8 * s, va_list * args)
   s = format (s, "\n   integrity alg %U%s%U",
              format_ipsec_integ_alg, sa->integ_alg,
              sa->integ_alg ? " key " : "", format_ipsec_key, &sa->integ_key);
+  vlib_get_combined_counter (&ipsec_sa_counters, sai, &counts);
+  s = format (s, "\n   packets %u bytes %u", counts.packets, counts.bytes);
 
-  if (sa->is_tunnel)
+  if (ipsec_sa_is_set_IS_TUNNEL (sa))
     {
       tx_table_id = fib_table_get_table_id (sa->tx_fib_index,
                                            FIB_PROTOCOL_IP4);