X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_format.c;h=80691f2836caebb855575ae076bbc787a4285134;hb=47feb1146ec3b0e1cf2ebd83cd5211e1df261194;hp=3659a7a897ff102ca16af812e6bb3d9baf70cdff;hpb=231c4696872cb344f28648949603840136c0795d;p=vpp.git

diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c
index 3659a7a897f..80691f2836c 100644
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -203,6 +203,12 @@ format_ipsec_spd (u8 * s, va_list * args)
   ipsec_spd_t *spd;
   u32 *i;
 
+  if (pool_is_free_index (im->spds, si))
+    {
+      s = format (s, "No such SPD index: %d", si);
+      goto done;
+    }
+
   spd = pool_elt_at_index (im->spds, si);
 
   s = format (s, "spd %u", spd->id);
@@ -216,6 +222,7 @@ format_ipsec_spd (u8 * s, va_list * args)
   foreach_ipsec_spd_policy_type;
 #undef _
 
+done:
   return (s);
 }
 
@@ -243,26 +250,49 @@ unformat_ipsec_key (unformat_input_t * input, va_list * args)
   return 1;
 }
 
+u8 *
+format_ipsec_sa_flags (u8 * s, va_list * args)
+{
+  ipsec_sa_flags_t flags = va_arg (*args, int);
+
+  if (0)
+    ;
+#define _(v, f, str) else if (flags & IPSEC_SA_FLAG_##f) s = format(s, "%s ", str);
+  foreach_ipsec_sa_flags
+#undef _
+    return (s);
+}
+
 u8 *
 format_ipsec_sa (u8 * s, va_list * args)
 {
   u32 sai = va_arg (*args, u32);
+  ipsec_format_flags_t flags = va_arg (*args, ipsec_format_flags_t);
   ipsec_main_t *im = &ipsec_main;
   vlib_counter_t counts;
   u32 tx_table_id;
   ipsec_sa_t *sa;
 
+  if (pool_is_free_index (im->sad, sai))
+    {
+      s = format (s, "No such SA index: %d", sai);
+      goto done;
+    }
+
   sa = pool_elt_at_index (im->sad, sai);
 
-  s = format (s, "[%d] sa 0x%x spi %u mode %s%s protocol %s%s%s%s",
+  s = format (s, "[%d] sa 0x%x spi %u mode %s%s protocol %s %U",
 	      sai, sa->id, sa->spi,
-	      sa->is_tunnel ? "tunnel" : "transport",
-	      sa->is_tunnel_ip6 ? "-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_IS_TUNNEL (sa) ? "tunnel" : "transport",
+	      ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? "-ip6" : "",
+	      sa->protocol ? "esp" : "ah", format_ipsec_sa_flags, sa->flags);
+
+  if (!(flags & IPSEC_FORMAT_DETAIL))
+    goto done;
+
+  s = format (s, "\n   salt 0x%x", 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",
@@ -275,7 +305,7 @@ format_ipsec_sa (u8 * s, va_list * args)
   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);
@@ -283,13 +313,54 @@ format_ipsec_sa (u8 * s, va_list * args)
 		  tx_table_id,
 		  format_ip46_address, &sa->tunnel_src_addr, IP46_TYPE_ANY,
 		  format_ip46_address, &sa->tunnel_dst_addr, IP46_TYPE_ANY);
-      s = 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);
+      if (!ipsec_sa_is_set_IS_INBOUND (sa))
+	{
+	  s =
+	    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);
+	}
+    }
+
+done:
+  return (s);
+}
+
+u8 *
+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))
+    {
+      s = format (s, "No such tunnel index: %d", ti);
+      goto done;
     }
 
+  t = pool_elt_at_index (im->tunnel_interfaces, ti);
+
+  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, "   out-bound sa: ");
+  s = format (s, "%U\n", format_ipsec_sa, t->output_sa_index,
+	      IPSEC_FORMAT_BRIEF);
+
+  s = format (s, "    in-bound sa: ");
+  s = format (s, "%U\n", format_ipsec_sa, t->input_sa_index,
+	      IPSEC_FORMAT_BRIEF);
+
+done:
   return (s);
 }