- s = format (s, " in-bound sa: ");
- s = format (s, "%U\n", format_ipsec_sa, t->input_sa_index,
- IPSEC_FORMAT_BRIEF);
+ s = format (s, "\n input-sa:");
+ /* *INDENT-OFF* */
+ FOR_EACH_IPSEC_PROTECT_INPUT_SAI(itp, sai,
+ ({
+ s = format (s, "\n %U", format_ipsec_sa, sai, IPSEC_FORMAT_BRIEF);
+ }));
+ /* *INDENT-ON* */
+
+ return (s);
+}
+
+u8 *
+format_ipsec4_tunnel_key (u8 * s, va_list * args)
+{
+ ipsec4_tunnel_key_t *key = va_arg (*args, ipsec4_tunnel_key_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));
+
+ return (s);
+}
+
+u8 *
+format_ipsec6_tunnel_key (u8 * s, va_list * args)
+{
+ ipsec6_tunnel_key_t *key = va_arg (*args, ipsec6_tunnel_key_t *);
+
+ 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));