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 6e6007e..a0cd5ad 100644 (file)
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -22,6 +22,7 @@
 #include <vnet/fib/fib_table.h>
 
 #include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ipsec_tun.h>
 
 u8 *
 format_ipsec_policy_action (u8 * s, va_list * args)
@@ -155,6 +156,7 @@ u8 *
 format_ipsec_policy (u8 * s, va_list * args)
 {
   u32 pi = va_arg (*args, u32);
+  ip46_type_t ip_type = IP46_TYPE_IP4;
   ipsec_main_t *im = &ipsec_main;
   ipsec_policy_t *p;
   vlib_counter_t counts;
@@ -177,17 +179,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);
@@ -281,8 +285,8 @@ format_ipsec_sa (u8 * s, va_list * args)
 
   sa = pool_elt_at_index (im->sad, sai);
 
-  s = format (s, "[%d] sa 0x%x spi %u mode %s%s protocol %s %U",
-             sai, sa->id, sa->spi,
+  s = format (s, "[%d] sa 0x%x spi %u (0x%08x) mode %s%s protocol %s %U",
+             sai, sa->id, sa->spi, sa->spi,
              ipsec_sa_is_set_IS_TUNNEL (sa) ? "tunnel" : "transport",
              ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? "-ip6" : "",
              sa->protocol ? "esp" : "ah", format_ipsec_sa_flags, sa->flags);
@@ -290,17 +294,20 @@ format_ipsec_sa (u8 * s, va_list * args)
   if (!(flags & IPSEC_FORMAT_DETAIL))
     goto done;
 
+  s = format (s, "\n   salt 0x%x", clib_net_to_host_u32 (sa->salt));
   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",
-             format_ipsec_crypto_alg, sa->crypto_alg,
-             sa->crypto_alg ? " key " : "",
-             format_ipsec_key, &sa->crypto_key);
-  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);
+  s = format (s, "\n   crypto alg %U",
+             format_ipsec_crypto_alg, sa->crypto_alg);
+  if (sa->crypto_alg)
+    s = format (s, " key %U", format_ipsec_key, &sa->crypto_key);
+  s = format (s, "\n   integrity alg %U",
+             format_ipsec_integ_alg, sa->integ_alg);
+  if (sa->integ_alg)
+    s = format (s, " key %U", 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);
 
@@ -318,9 +325,7 @@ format_ipsec_sa (u8 * s, va_list * args)
            format (s, "\n    resovle via fib-entry: %d",
                    sa->fib_entry_index);
          s = format (s, "\n    stacked on:");
-         s =
-           format (s, "\n      %U", format_dpo_id,
-                   &sa->dpo[IPSEC_PROTOCOL_ESP], 6);
+         s = format (s, "\n      %U", format_dpo_id, &sa->dpo, 6);
        }
     }
 
@@ -333,7 +338,6 @@ format_ipsec_tunnel (u8 * s, va_list * args)
 {
   ipsec_main_t *im = &ipsec_main;
   u32 ti = va_arg (*args, u32);
-  vnet_hw_interface_t *hi;
   ipsec_tunnel_if_t *t;
 
   if (pool_is_free_index (im->tunnel_interfaces, ti))
@@ -347,9 +351,9 @@ format_ipsec_tunnel (u8 * s, va_list * args)
   if (t->hw_if_index == ~0)
     goto done;
 
-  hi = vnet_get_hw_interface (im->vnet_main, t->hw_if_index);
-
-  s = format (s, "%s\n", hi->name);
+  s =
+    format (s, "%U\n", format_vnet_hw_if_index_name, im->vnet_main,
+           t->hw_if_index);
 
   s = format (s, "   out-bound sa: ");
   s = format (s, "%U\n", format_ipsec_sa, t->output_sa_index,
@@ -363,6 +367,40 @@ done:
   return (s);
 }
 
+u8 *
+format_ipsec_tun_protect (u8 * s, va_list * args)
+{
+  u32 itpi = va_arg (*args, u32);
+  ipsec_tun_protect_t *itp;
+  u32 sai;
+
+  if (pool_is_free_index (ipsec_protect_pool, itpi))
+    {
+      s = format (s, "No such tunnel index: %d", itpi);
+      goto done;
+    }
+
+  itp = pool_elt_at_index (ipsec_protect_pool, itpi);
+
+  s = format (s, "%U", format_vnet_sw_if_index_name,
+             vnet_get_main (), itp->itp_sw_if_index);
+  s = format (s, "\n output-sa:");
+  s =
+    format (s, "\n  %U", format_ipsec_sa, itp->itp_out_sa,
+           IPSEC_FORMAT_BRIEF);
+
+  s = format (s, "\n input-sa:");
+  /* *INDENT-OFF* */
+  FOR_EACH_IPSEC_PROTECT_INPUT_SAI(itp, sai,
+  ({
+  s = format (s, "\n  %U", format_ipsec_sa, sai, IPSEC_FORMAT_BRIEF);
+  }));
+  /* *INDENT-ON* */
+
+done:
+  return (s);
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *