X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_format.c;h=e6e828931dd6361776613131536c230cb99fa745;hb=12989b538;hp=80691f2836caebb855575ae076bbc787a4285134;hpb=47feb1146ec3b0e1cf2ebd83cd5211e1df261194;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index 80691f2836c..e6e828931dd 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) @@ -155,6 +156,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,17 +179,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, - clib_net_to_host_u16 (p->lport.start), - clib_net_to_host_u16 (p->lport.stop)); + format_ip46_address, &p->laddr.start, ip_type, + format_ip46_address, &p->laddr.stop, ip_type, + 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, IP46_TYPE_ANY, - format_ip46_address, &p->raddr.stop, IP46_TYPE_ANY, - clib_net_to_host_u16 (p->rport.start), - clib_net_to_host_u16 (p->rport.stop)); + format_ip46_address, &p->raddr.start, ip_type, + format_ip46_address, &p->raddr.stop, ip_type, + 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); @@ -255,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); @@ -281,27 +283,32 @@ 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 salt 0x%x", sa->salt); + 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 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%s%U", - format_ipsec_crypto_alg, sa->crypto_alg, - sa->crypto_alg ? " key " : "", - format_ipsec_key, &sa->crypto_key); - s = format (s, "\n integrity alg %U%s%U", - format_ipsec_integ_alg, sa->integ_alg, - sa->integ_alg ? " key " : "", format_ipsec_key, &sa->integ_key); + s = format (s, "\n crypto alg %U", + format_ipsec_crypto_alg, 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 && (flags & IPSEC_FORMAT_INSECURE)) + s = format (s, " key %U", format_ipsec_key, &sa->integ_key); + else + s = format (s, " key [redacted]"); + vlib_get_combined_counter (&ipsec_sa_counters, sai, &counts); s = format (s, "\n packets %u bytes %u", counts.packets, counts.bytes); @@ -319,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); } } @@ -330,37 +335,62 @@ done: } u8 * -format_ipsec_tunnel (u8 * s, va_list * args) +format_ipsec_tun_protect (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; + u32 itpi = va_arg (*args, u32); + ipsec_tun_protect_t *itp; + u32 sai; - if (pool_is_free_index (im->tunnel_interfaces, ti)) + if (pool_is_free_index (ipsec_protect_pool, itpi)) { - s = format (s, "No such tunnel index: %d", ti); + s = format (s, "No such tunnel index: %d", itpi); goto done; } - t = pool_elt_at_index (im->tunnel_interfaces, ti); + itp = pool_elt_at_index (ipsec_protect_pool, itpi); - if (t->hw_if_index == ~0) - goto done; + s = format (s, "%U", format_vnet_sw_if_index_name, + vnet_get_main (), itp->itp_sw_if_index); + s = format (s, "\n output-sa:"); + s = + format (s, "\n %U", format_ipsec_sa, itp->itp_out_sa, + IPSEC_FORMAT_BRIEF); - hi = vnet_get_hw_interface (im->vnet_main, t->hw_if_index); + 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* */ - s = format (s, "%s\n", hi->name); +done: + return (s); +} - s = format (s, " out-bound sa: "); - s = format (s, "%U\n", format_ipsec_sa, t->output_sa_index, - IPSEC_FORMAT_BRIEF); +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, " in-bound sa: "); - s = format (s, "%U\n", format_ipsec_sa, t->input_sa_index, - IPSEC_FORMAT_BRIEF); + 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)); -done: return (s); }