X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_format.c;h=001aa010364ab504399fb51c232303eb6ebb0cb6;hb=c7eaa711f3e25580687df0618e9ca80d3dc85e5f;hp=19321e7e3474e35d6a68a46bcb4e555002116d93;hpb=4c71d6c8f84d48754a8ead116f223088b85f587c;p=vpp.git

diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c
index 19321e7e347..001aa010364 100644
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -273,7 +273,6 @@ format_ipsec_sa (u8 * s, va_list * args)
   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))
@@ -318,26 +317,7 @@ format_ipsec_sa (u8 * s, va_list * args)
   s = format (s, "\n   packets %u bytes %u", counts.packets, counts.bytes);
 
   if (ipsec_sa_is_set_IS_TUNNEL (sa))
-    {
-      tx_table_id = fib_table_get_table_id (
-	sa->tx_fib_index,
-	(ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? FIB_PROTOCOL_IP6 :
-					     FIB_PROTOCOL_IP4));
-      s = format (s, "\n   table-ID %d tunnel %U src %U dst %U flags %U",
-		  tx_table_id,
-		  format_ip_dscp, sa->dscp,
-		  format_ip46_address, &sa->tunnel_src_addr, IP46_TYPE_ANY,
-		  format_ip46_address, &sa->tunnel_dst_addr, IP46_TYPE_ANY,
-		  format_tunnel_encap_decap_flags, sa->tunnel_flags);
-      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, 6);
-	}
-    }
+    s = format (s, "\n%U", format_tunnel, &sa->tunnel, 3);
 
 done:
   return (s);