X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_format.c;h=909254a1dc9665570e050c27b66dd92136f523f2;hb=03fabbd22215d306fb66c51f952480631d67c9dc;hp=a0cd5ad67cf6ecbfe5e6a606b120808f2e713958;hpb=a4d2431594e492c3243f97881fb3ba66e3b4fd76;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index a0cd5ad67cf..909254a1dc9 100644 --- a/src/vnet/ipsec/ipsec_format.c +++ b/src/vnet/ipsec/ipsec_format.c @@ -23,6 +23,7 @@ #include #include +#include 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; @@ -259,9 +260,7 @@ format_ipsec_sa_flags (u8 * s, va_list * args) { ipsec_sa_flags_t flags = va_arg (*args, int); - if (0) - ; -#define _(v, f, str) else if (flags & IPSEC_SA_FLAG_##f) s = format(s, "%s ", str); +#define _(v, f, str) if (flags & IPSEC_SA_FLAG_##f) s = format(s, "%s ", str); foreach_ipsec_sa_flags #undef _ return (s); @@ -285,40 +284,52 @@ format_ipsec_sa (u8 * s, va_list * args) sa = pool_elt_at_index (im->sad, sai); - s = format (s, "[%d] sa 0x%x spi %u (0x%08x) mode %s%s protocol %s %U", - sai, sa->id, sa->spi, sa->spi, - ipsec_sa_is_set_IS_TUNNEL (sa) ? "tunnel" : "transport", - ipsec_sa_is_set_IS_TUNNEL_V6 (sa) ? "-ip6" : "", + s = format (s, "[%d] sa %u (0x%x) spi %u (0x%08x) protocol:%s flags:[%U]", + sai, sa->id, sa->id, sa->spi, sa->spi, sa->protocol ? "esp" : "ah", format_ipsec_sa_flags, sa->flags); if (!(flags & IPSEC_FORMAT_DETAIL)) goto done; + s = format (s, "\n locks %d", sa->node.fn_locks); s = format (s, "\n salt 0x%x", clib_net_to_host_u32 (sa->salt)); + s = format (s, "\n thread-indices [encrypt:%d decrypt:%d]", + sa->encrypt_thread_index, sa->decrypt_thread_index); 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, format_ipsec_replay_window, sa->replay_window); s = format (s, "\n crypto alg %U", format_ipsec_crypto_alg, sa->crypto_alg); - if (sa->crypto_alg) + if (sa->crypto_alg && (flags & IPSEC_FORMAT_INSECURE)) s = format (s, " key %U", format_ipsec_key, &sa->crypto_key); + else + s = format (s, " key [redacted]"); s = format (s, "\n integrity alg %U", format_ipsec_integ_alg, sa->integ_alg); - if (sa->integ_alg) + if (sa->integ_alg && (flags & IPSEC_FORMAT_INSECURE)) 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 = @@ -334,60 +345,49 @@ done: } u8 * -format_ipsec_tunnel (u8 * s, va_list * args) +format_ipsec_tun_protect_index (u8 * s, va_list * args) { - ipsec_main_t *im = &ipsec_main; - u32 ti = va_arg (*args, u32); - ipsec_tunnel_if_t *t; - - if (pool_is_free_index (im->tunnel_interfaces, ti)) - { - s = format (s, "No such tunnel index: %d", ti); - goto done; - } - - t = pool_elt_at_index (im->tunnel_interfaces, ti); + u32 itpi = va_arg (*args, index_t); + ipsec_tun_protect_t *itp; - if (t->hw_if_index == ~0) - goto done; + if (pool_is_free_index (ipsec_tun_protect_pool, itpi)) + return (format (s, "No such tunnel index: %d", itpi)); - s = - format (s, "%U\n", format_vnet_hw_if_index_name, im->vnet_main, - t->hw_if_index); + itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi); - s = format (s, " out-bound sa: "); - s = format (s, "%U\n", format_ipsec_sa, t->output_sa_index, - IPSEC_FORMAT_BRIEF); + return (format (s, "%U", format_ipsec_tun_protect, itp)); +} - s = format (s, " in-bound sa: "); - s = format (s, "%U\n", format_ipsec_sa, t->input_sa_index, - IPSEC_FORMAT_BRIEF); +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 _ -done: return (s); } u8 * format_ipsec_tun_protect (u8 * s, va_list * args) { - u32 itpi = va_arg (*args, u32); - ipsec_tun_protect_t *itp; + ipsec_tun_protect_t *itp = va_arg (*args, ipsec_tun_protect_t *); u32 sai; - if (pool_is_free_index (ipsec_protect_pool, itpi)) - { - s = format (s, "No such tunnel index: %d", itpi); - goto done; - } - - itp = pool_elt_at_index (ipsec_protect_pool, itpi); - - 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:"); - s = - format (s, "\n %U", format_ipsec_sa, itp->itp_out_sa, - IPSEC_FORMAT_BRIEF); + s = format (s, "\n %U", format_ipsec_sa, itp->itp_out_sa, + IPSEC_FORMAT_BRIEF); s = format (s, "\n input-sa:"); /* *INDENT-OFF* */ @@ -397,7 +397,52 @@ format_ipsec_tun_protect (u8 * s, va_list * args) })); /* *INDENT-ON* */ -done: + return (s); +} + +u8 * +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) +{ + 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_ipsec_itf (u8 * s, va_list * a) +{ + index_t ii = va_arg (*a, index_t); + ipsec_itf_t *itf; + + 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); }