ipsec: One DPO per SA

[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 93b1efd..d0d073b 100644 (file)
--- a/src/vnet/ipsec/ipsec_format.c
+++ b/src/vnet/ipsec/ipsec_format.c
@@ -155,6 +155,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,15 +178,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,
+             format_ip46_address, &p->laddr.start, ip_type,
+             format_ip46_address, &p->laddr.stop, ip_type,
              clib_net_to_host_u16 (p->lport.start),
              clib_net_to_host_u16 (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,
+             format_ip46_address, &p->raddr.start, ip_type,
+             format_ip46_address, &p->raddr.stop, ip_type,
              clib_net_to_host_u16 (p->rport.start),
              clib_net_to_host_u16 (p->rport.stop));
 
@@ -290,7 +295,7 @@ format_ipsec_sa (u8 * s, va_list * args)
   if (!(flags & IPSEC_FORMAT_DETAIL))
     goto done;
 
-  s = format (s, "\n   salt 0x%x", sa->salt);
+  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,
@@ -303,6 +308,7 @@ format_ipsec_sa (u8 * s, va_list * args)
              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);
 
@@ -320,9 +326,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);
        }
     }
 
@@ -335,7 +339,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))
@@ -349,9 +352,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,