From 2b5ba9501c3dda3645bf01eb53b2821471f2a946 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Tue, 2 Apr 2019 10:15:40 +0000 Subject: IPSEC: tunnel scaling - don't stack the inbould SA Change-Id: I0b47590400aebea09aa1b27de753be638e1ba870 Signed-off-by: Neale Ranns --- src/vpp/api/custom_dump.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/vpp/api/types.c | 8 ++++---- 2 files changed, 47 insertions(+), 4 deletions(-) (limited to 'src/vpp') diff --git a/src/vpp/api/custom_dump.c b/src/vpp/api/custom_dump.c index fac2aa26c0d..9e150e91a7b 100644 --- a/src/vpp/api/custom_dump.c +++ b/src/vpp/api/custom_dump.c @@ -3307,6 +3307,48 @@ static void *vl_api_lisp_eid_table_map_dump_t_print FINISH; } +static void *vl_api_ipsec_tunnel_if_add_del_t_print + (vl_api_ipsec_tunnel_if_add_del_t * mp, void *handle) +{ + u8 *s; + + s = format (0, "SCRIPT: ipsec_tunnel_if_add_del "); + + if (mp->esn) + s = format (s, "esn"); + if (mp->anti_replay) + s = format (s, "anti-replay"); + if (mp->udp_encap) + s = format (s, "udp-encap"); + + s = format (s, "local-ip %U ", format_vl_api_address, &mp->remote_ip); + + s = format (s, "remote-ip %U ", format_vl_api_address, &mp->local_ip); + s = format (s, "tx-table-id %d ", ntohl (mp->tx_table_id)); + + s = format (s, "local-spi %d ", ntohl (mp->local_spi)); + + s = format (s, "remote-spi %d ", ntohl (mp->remote_spi)); + + s = format (s, "local-crypto-key-len %d ", mp->local_crypto_key_len); + s = format (s, "local-crypto-key %U ", format_hex_bytes, + mp->local_crypto_key, mp->local_crypto_key_len, 0); + s = format (s, "remote-crypto-key-len %d ", mp->remote_crypto_key_len); + s = format (s, "remote-crypto-key %U ", format_hex_bytes, + mp->remote_crypto_key, mp->remote_crypto_key_len, 0); + s = format (s, "local-integ-key-len %d ", mp->local_integ_key_len); + s = format (s, "local-integ-key %U ", format_hex_bytes, + mp->local_integ_key, mp->local_integ_key_len, 0); + s = format (s, "remote-integ-key-len %d ", mp->remote_integ_key_len); + s = format (s, "remote-integ-key %U ", format_hex_bytes, + mp->remote_integ_key, mp->remote_integ_key_len, 0); + + if (mp->is_add == 0) + s = format (s, "del "); + + FINISH; +} + static void *vl_api_ipsec_gre_tunnel_add_del_t_print (vl_api_ipsec_gre_tunnel_add_del_t * mp, void *handle) { @@ -3899,6 +3941,7 @@ _(SHOW_LISP_RLOC_PROBE_STATE, show_lisp_rloc_probe_state) \ _(SHOW_LISP_MAP_REGISTER_STATE, show_lisp_map_register_state) \ _(LISP_RLOC_PROBE_ENABLE_DISABLE, lisp_rloc_probe_enable_disable) \ _(LISP_MAP_REGISTER_ENABLE_DISABLE, lisp_map_register_enable_disable) \ +_(IPSEC_TUNNEL_IF_ADD_DEL, ipsec_tunnel_if_add_del) \ _(IPSEC_GRE_TUNNEL_ADD_DEL, ipsec_gre_tunnel_add_del) \ _(IPSEC_GRE_TUNNEL_DUMP, ipsec_gre_tunnel_dump) \ _(DELETE_SUBIF, delete_subif) \ diff --git a/src/vpp/api/types.c b/src/vpp/api/types.c index e36b8dd6781..427e9f0da3a 100644 --- a/src/vpp/api/types.c +++ b/src/vpp/api/types.c @@ -25,9 +25,9 @@ format_vl_api_address (u8 * s, va_list * args) const vl_api_address_t *addr = va_arg (*args, vl_api_address_t *); if (ADDRESS_IP6 == clib_net_to_host_u32 (addr->af)) - s = format (s, "ip6:%U", format_ip6_address, addr->un.ip6); + s = format (s, "%U", format_ip6_address, addr->un.ip6); else - s = format (s, "ip4:%U", format_ip4_address, addr->un.ip4); + s = format (s, "%U", format_ip4_address, addr->un.ip4); return s; } @@ -40,9 +40,9 @@ format_vl_api_address_union (u8 * s, va_list * args) vl_api_address_family_t af = va_arg (*args, vl_api_address_family_t); if (ADDRESS_IP6 == af) - s = format (s, "ip6:%U", format_ip6_address, addr->ip6); + s = format (s, "%U", format_ip6_address, addr->ip6); else - s = format (s, "ip4:%U", format_ip4_address, addr->ip4); + s = format (s, "%U", format_ip4_address, addr->ip4); return s; } -- cgit 1.2.3-korg