X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_format.c;h=c8c0170efe77e28cc42aa2de7c58f3cd242585e5;hb=7cd35f5d688d9e3bddf66602655274dae944b086;hp=98de779b0de6349d2b1c1989dadbd16eaa430af2;hpb=abc5660c61698fa29252dc202358002a97f2608c;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_format.c b/src/vnet/ipsec/ipsec_format.c index 98de779b0de..c8c0170efe7 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; @@ -230,6 +231,28 @@ done: return (s); } +u8 * +format_ipsec_out_spd_flow_cache (u8 *s, va_list *args) +{ + ipsec_main_t *im = &ipsec_main; + + s = format (s, "\nipv4-outbound-spd-flow-cache-entries: %u", + im->ipsec4_out_spd_flow_cache_entries); + + return (s); +} + +u8 * +format_ipsec_in_spd_flow_cache (u8 *s, va_list *args) +{ + ipsec_main_t *im = &ipsec_main; + + s = format (s, "\nipv4-inbound-spd-flow-cache-entries: %u", + im->ipsec4_in_spd_flow_cache_entries); + + return (s); +} + u8 * format_ipsec_key (u8 * s, va_list * args) { @@ -270,18 +293,17 @@ format_ipsec_sa (u8 * s, va_list * args) { u32 sai = va_arg (*args, u32); ipsec_format_flags_t flags = va_arg (*args, ipsec_format_flags_t); - ipsec_main_t *im = &ipsec_main; vlib_counter_t counts; - u32 tx_table_id; + counter_t lost; ipsec_sa_t *sa; - if (pool_is_free_index (im->sad, sai)) + if (pool_is_free_index (ipsec_sa_pool, sai)) { s = format (s, "No such SA index: %d", sai); goto done; } - sa = pool_elt_at_index (im->sad, sai); + sa = ipsec_sa_get (sai); 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, @@ -292,12 +314,10 @@ format_ipsec_sa (u8 * s, va_list * args) 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 thread-index:%d", sa->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 window %U", 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 && (flags & IPSEC_FORMAT_INSECURE)) @@ -315,25 +335,12 @@ format_ipsec_sa (u8 * s, va_list * args) 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); + lost = vlib_get_simple_counter (&ipsec_sa_lost_counters, sai); + s = format (s, "\n tx/rx:[packets:%Ld bytes:%Ld], lost:[packets:%Ld]", + counts.packets, counts.bytes, lost); 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, - format_ip46_address, &sa->tunnel_src_addr, IP46_TYPE_ANY, - format_ip46_address, &sa->tunnel_dst_addr, IP46_TYPE_ANY); - if (!ipsec_sa_is_set_IS_INBOUND (sa)) - { - s = - 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, 6); - } - } + s = format (s, "\n%U", format_tunnel, &sa->tunnel, 3); done: return (s); @@ -353,6 +360,21 @@ format_ipsec_tun_protect_index (u8 * s, va_list * args) return (format (s, "%U", format_ipsec_tun_protect, itp)); } +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 _ + + return (s); +} u8 * format_ipsec_tun_protect (u8 * s, va_list * args) @@ -360,8 +382,9 @@ 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", 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:"); @@ -380,27 +403,47 @@ format_ipsec_tun_protect (u8 * s, va_list * args) } u8 * -format_ipsec4_tunnel_key (u8 * s, va_list * args) +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) { - ipsec4_tunnel_key_t *key = va_arg (*args, ipsec4_tunnel_key_t *); + ipsec6_tunnel_kv_t *kv = va_arg (*args, ipsec6_tunnel_kv_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)); + 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_ipsec6_tunnel_key (u8 * s, va_list * args) +format_ipsec_itf (u8 * s, va_list * a) { - ipsec6_tunnel_key_t *key = va_arg (*args, ipsec6_tunnel_key_t *); + index_t ii = va_arg (*a, index_t); + ipsec_itf_t *itf; - 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)); + 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); }