ipsec: Honour IPSec SA table-ID over API

[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 bf398cb..909254a 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)
@@ -95,7 +96,7 @@ format_ipsec_crypto_alg (u8 * s, va_list * args)
 uword
 unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args)
 {
-  u32 *r = va_arg (*args, u32 *);
+  ipsec_crypto_alg_t *r = va_arg (*args, ipsec_crypto_alg_t *);
 
   if (0);
 #define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f;
@@ -127,7 +128,7 @@ format_ipsec_integ_alg (u8 * s, va_list * args)
 uword
 unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args)
 {
-  u32 *r = va_arg (*args, u32 *);
+  ipsec_integ_alg_t *r = va_arg (*args, ipsec_integ_alg_t *);
 
   if (0);
 #define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f;
@@ -310,18 +311,25 @@ format_ipsec_sa (u8 * s, va_list * args)
     s = format (s, " key %U", format_ipsec_key, &sa->integ_key);
   else
     s = format (s, " key [redacted]");
+  s = format (s, "\n   UDP:[src:%d dst:%d]",
+             clib_host_to_net_u16 (sa->udp_hdr.src_port),
+             clib_host_to_net_u16 (sa->udp_hdr.dst_port));
 
   vlib_get_combined_counter (&ipsec_sa_counters, sai, &counts);
   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,
-                                           FIB_PROTOCOL_IP4);
-      s = format (s, "\n   table-ID %d tunnel src %U dst %U",
+      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_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 =
@@ -350,6 +358,21 @@ format_ipsec_tun_protect_index (u8 * s, va_list * args)
   return (format (s, "%U", format_ipsec_tun_protect, itp));
 }
 
+u8 *
+format_ipsec_tun_protect_flags (u8 * s, va_list * args)
+{
+  ipsec_protect_flags_t flags = va_arg (*args, int);
+
+  if (IPSEC_PROTECT_NONE == flags)
+    s = format (s, "none");
+#define _(a,b,c)                                \
+  else if (flags & IPSEC_PROTECT_##a)           \
+    s = format (s, "%s", c);                    \
+  foreach_ipsec_protect_flags
+#undef _
+
+  return (s);
+}
 
 u8 *
 format_ipsec_tun_protect (u8 * s, va_list * args)
@@ -357,8 +380,9 @@ format_ipsec_tun_protect (u8 * s, va_list * args)
   ipsec_tun_protect_t *itp = va_arg (*args, ipsec_tun_protect_t *);
   u32 sai;
 
-  s = format (s, "%U", format_vnet_sw_if_index_name,
-             vnet_get_main (), itp->itp_sw_if_index);
+  s = format (s, "%U flags:[%U]", format_vnet_sw_if_index_name,
+             vnet_get_main (), itp->itp_sw_if_index,
+             format_ipsec_tun_protect_flags, itp->itp_flags);
   if (!ip_address_is_zero (itp->itp_key))
     s = format (s, ": %U", format_ip_address, itp->itp_key);
   s = format (s, "\n output-sa:");
@@ -377,27 +401,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_kv_t *kv = va_arg (*args, ipsec4_tunnel_kv_t *);
+  ip4_address_t ip;
+  u32 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)
 {
-  ipsec4_tunnel_key_t *key = va_arg (*args, ipsec4_tunnel_key_t *);
+  ipsec6_tunnel_kv_t *kv = va_arg (*args, ipsec6_tunnel_kv_t *);
 
-  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));
+  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);
 }