X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_format.c;h=e3c6f22bf00b2956d216c5625f22220a7d695e58;hb=dd4ccf262;hp=5bcfcdbeff1192db4fa50e1a06e65c3df5cb80f8;hpb=5f08ab6493e1420d84c03d0b62431ac3a6de4ce9;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index 5bcfcdbeff1..e3c6f22bf00 100644 --- a/src/vnet/ipsec/ipsec_format.c +++ b/src/vnet/ipsec/ipsec_format.c @@ -22,6 +22,7 @@ #include #include +#include u8 * format_ipsec_policy_action (u8 * s, va_list * args) @@ -186,13 +187,11 @@ format_ipsec_policy (u8 * s, va_list * args) s = format (s, "\n local addr range %U - %U port range %u - %u", 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)); + p->lport.start, p->lport.stop); s = format (s, "\n remote addr range %U - %U port range %u - %u", 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)); + p->rport.start, p->rport.stop); vlib_get_combined_counter (&ipsec_spd_policy_counters, pi, &counts); s = format (s, "\n packets %u bytes %u", counts.packets, counts.bytes); @@ -260,9 +259,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); @@ -286,28 +283,36 @@ 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 mode %s%s protocol %s %U", - sai, sa->id, 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); @@ -326,9 +331,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); } } @@ -337,36 +340,84 @@ 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; + u32 itpi = va_arg (*args, index_t); + ipsec_tun_protect_t *itp; - if (pool_is_free_index (im->tunnel_interfaces, ti)) - { - s = format (s, "No such tunnel index: %d", ti); - goto done; - } + if (pool_is_free_index (ipsec_tun_protect_pool, itpi)) + return (format (s, "No such tunnel index: %d", itpi)); - t = pool_elt_at_index (im->tunnel_interfaces, ti); + itp = pool_elt_at_index (ipsec_tun_protect_pool, itpi); - if (t->hw_if_index == ~0) - goto done; + return (format (s, "%U", format_ipsec_tun_protect, itp)); +} - s = - format (s, "%U\n", format_vnet_hw_if_index_name, im->vnet_main, - t->hw_if_index); +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 _ - s = format (s, " out-bound sa: "); - s = format (s, "%U\n", format_ipsec_sa, t->output_sa_index, - IPSEC_FORMAT_BRIEF); + return (s); +} - s = format (s, " in-bound sa: "); - s = format (s, "%U\n", format_ipsec_sa, t->input_sa_index, +u8 * +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 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); -done: + 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)); + return (s); }