ipsec: support for multipoint on ipsec interfaces

[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 e3c6f22..6781fe5 100644 (file)
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -23,6 +23,7 @@
 
 #include <vnet/ipsec/ipsec.h>
 #include <vnet/ipsec/ipsec_tun.h>
+#include <vnet/ipsec/ipsec_itf.h>
 
 u8 *
 format_ipsec_policy_action (u8 * s, va_list * args)
@@ -396,27 +397,47 @@ format_ipsec_tun_protect (u8 * s, va_list * args)
 }
 
 u8 *
-format_ipsec4_tunnel_key (u8 * s, va_list * args)
+format_ipsec4_tunnel_kv (u8 * s, va_list * args)
 {
-  ipsec4_tunnel_key_t *key = va_arg (*args, ipsec4_tunnel_key_t *);
+  ipsec4_tunnel_kv_t *kv = va_arg (*args, ipsec4_tunnel_kv_t *);
+  ip4_address_t ip;
+  u32 spi;
 
-  s = format (s, "remote:%U spi:%u (0x%08x)",
-             format_ip4_address, &key->remote_ip,
-             clib_net_to_host_u32 (key->spi),
-             clib_net_to_host_u32 (key->spi));
+  ipsec4_tunnel_extract_key (kv, &ip, &spi);
+
+  s = format (s, "remote:%U spi:%u (0x%08x) sa:%d tun:%d",
+             format_ip4_address, &ip,
+             clib_net_to_host_u32 (spi),
+             clib_net_to_host_u32 (spi),
+             kv->value.sa_index, kv->value.tun_index);
+
+  return (s);
+}
+
+u8 *
+format_ipsec6_tunnel_kv (u8 * s, va_list * args)
+{
+  ipsec6_tunnel_kv_t *kv = va_arg (*args, ipsec6_tunnel_kv_t *);
+
+  s = format (s, "remote:%U spi:%u (0x%08x) sa:%d tun:%d",
+             format_ip6_address, &kv->key.remote_ip,
+             clib_net_to_host_u32 (kv->key.spi),
+             clib_net_to_host_u32 (kv->key.spi),
+             kv->value.sa_index, kv->value.tun_index);
 
   return (s);
 }
 
 u8 *
-format_ipsec6_tunnel_key (u8 * s, va_list * args)
+format_ipsec_itf (u8 * s, va_list * a)
 {
-  ipsec6_tunnel_key_t *key = va_arg (*args, ipsec6_tunnel_key_t *);
+  index_t ii = va_arg (*a, index_t);
+  ipsec_itf_t *itf;
 
-  s = format (s, "remote:%U spi:%u (0x%08x)",
-             format_ip6_address, &key->remote_ip,
-             clib_net_to_host_u32 (key->spi),
-             clib_net_to_host_u32 (key->spi));
+  itf = ipsec_itf_get (ii);
+  s = format (s, "[%d] %U %U",
+             ii, format_vnet_sw_if_index_name, vnet_get_main (),
+             itf->ii_sw_if_index, format_tunnel_mode, itf->ii_mode);
 
   return (s);
 }