X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_cli.c;h=eed910edb9309ce3701b155e438dc8960c76d166;hb=c7eaa711f;hp=38a2fed4587679dfe3ece8e363a7f23b9bca3e65;hpb=0224514c28bdee05ea11a89a721c810e5f99ede2;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c index 38a2fed4587..eed910edb93 100644 --- a/src/vnet/ipsec/ipsec_cli.c +++ b/src/vnet/ipsec/ipsec_cli.c @@ -20,8 +20,10 @@ #include #include #include +#include #include +#include static clib_error_t * set_interface_spd_command_fn (vlib_main_t * vm, @@ -34,6 +36,7 @@ set_interface_spd_command_fn (vlib_main_t * vm, u32 spd_id; int is_add = 1; clib_error_t *error = NULL; + int err; if (!unformat_user (input, unformat_line_input, line_input)) return 0; @@ -51,7 +54,16 @@ set_interface_spd_command_fn (vlib_main_t * vm, goto done; } - ipsec_set_interface_spd (vm, sw_if_index, spd_id, is_add); + err = ipsec_set_interface_spd (vm, sw_if_index, spd_id, is_add); + switch (err) + { + case VNET_API_ERROR_SYSCALL_ERROR_1: + error = clib_error_return (0, "no such spd-id"); + break; + case VNET_API_ERROR_SYSCALL_ERROR_2: + error = clib_error_return (0, "spd already assigned"); + break; + } done: unformat_free (line_input); @@ -74,9 +86,6 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, vlib_cli_command_t * cmd) { unformat_input_t _line_input, *line_input = &_line_input; - ip46_address_t tun_src = { }, tun_dst = - { - }; ipsec_crypto_alg_t crypto_alg; ipsec_integ_alg_t integ_alg; ipsec_protocol_t proto; @@ -84,13 +93,21 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, clib_error_t *error; ipsec_key_t ck = { 0 }; ipsec_key_t ik = { 0 }; - u32 id, spi, salt; + u32 id, spi, salt, sai; + int i = 0; + u16 udp_src, udp_dst; int is_add, rv; + u32 m_args = 0; + tunnel_t tun; + salt = 0; error = NULL; is_add = 0; flags = IPSEC_SA_FLAG_NONE; proto = IPSEC_PROTOCOL_ESP; + integ_alg = IPSEC_INTEG_ALG_NONE; + crypto_alg = IPSEC_CRYPTO_ALG_NONE; + udp_src = udp_dst = IPSEC_UDP_PORT_NONE; if (!unformat_user (input, unformat_line_input, line_input)) return 0; @@ -98,12 +115,18 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { if (unformat (line_input, "add %u", &id)) - is_add = 1; + { + is_add = 1; + m_args |= 1 << 0; + } else if (unformat (line_input, "del %u", &id)) - is_add = 0; + { + is_add = 0; + m_args |= 1 << 0; + } else if (unformat (line_input, "spi %u", &spi)) - ; - else if (unformat (line_input, "salt %u", &salt)) + m_args |= 1 << 1; + else if (unformat (line_input, "salt 0x%x", &salt)) ; else if (unformat (line_input, "esp")) proto = IPSEC_PROTOCOL_ESP; @@ -120,16 +143,22 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, else if (unformat (line_input, "integ-alg %U", unformat_ipsec_integ_alg, &integ_alg)) ; - else if (unformat (line_input, "tunnel-src %U", - unformat_ip46_address, &tun_src, IP46_TYPE_ANY)) + else if (unformat (line_input, " %U", unformat_tunnel, &tun)) { flags |= IPSEC_SA_FLAG_IS_TUNNEL; - if (!ip46_address_is_ip4 (&tun_src)) + if (AF_IP6 == tunnel_get_af (&tun)) flags |= IPSEC_SA_FLAG_IS_TUNNEL_V6; } - else if (unformat (line_input, "tunnel-dst %U", - unformat_ip46_address, &tun_dst, IP46_TYPE_ANY)) - ; + else if (unformat (line_input, "udp-src-port %d", &i)) + udp_src = i; + else if (unformat (line_input, "udp-dst-port %d", &i)) + udp_dst = i; + else if (unformat (line_input, "inbound")) + flags |= IPSEC_SA_FLAG_IS_INBOUND; + else if (unformat (line_input, "use-anti-replay")) + flags |= IPSEC_SA_FLAG_USE_ANTI_REPLAY; + else if (unformat (line_input, "use-esn")) + flags |= IPSEC_SA_FLAG_USE_ESN; else if (unformat (line_input, "udp-encap")) flags |= IPSEC_SA_FLAG_UDP_ENCAP; else @@ -139,17 +168,37 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, goto done; } } + if ((flags & IPSEC_SA_FLAG_IS_INBOUND) + && !(flags & IPSEC_SA_FLAG_IS_TUNNEL)) + { + error = clib_error_return (0, "inbound specified on non-tunnel SA"); + goto done; + } + + if (!(m_args & 1)) + { + error = clib_error_return (0, "missing id"); + goto done; + } if (is_add) - rv = ipsec_sa_add (id, spi, proto, crypto_alg, - &ck, integ_alg, &ik, flags, - 0, clib_host_to_net_u32 (salt), - &tun_src, &tun_dst, NULL); + { + if (!(m_args & 2)) + { + error = clib_error_return (0, "missing spi"); + goto done; + } + rv = ipsec_sa_add_and_lock (id, spi, proto, crypto_alg, &ck, integ_alg, + &ik, flags, clib_host_to_net_u32 (salt), + udp_src, udp_dst, &tun, &sai); + } else - rv = ipsec_sa_del (id); + { + rv = ipsec_sa_unlock_id (id); + } if (rv) - clib_error_return (0, "failed"); + error = clib_error_return (0, "failed"); done: unformat_free (line_input); @@ -227,16 +276,13 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, unformat_input_t _line_input, *line_input = &_line_input; ipsec_policy_t p; int rv, is_add = 0; - u32 tmp, tmp2, stat_index; + u32 tmp, tmp2, stat_index, local_range_set, remote_range_set; clib_error_t *error = NULL; u32 is_outbound; clib_memset (&p, 0, sizeof (p)); p.lport.stop = p.rport.stop = ~0; - p.laddr.stop.ip4.as_u32 = p.raddr.stop.ip4.as_u32 = (u32) ~ 0; - p.laddr.stop.ip6.as_u64[0] = p.laddr.stop.ip6.as_u64[1] = (u64) ~ 0; - p.raddr.stop.ip6.as_u64[0] = p.raddr.stop.ip6.as_u64[1] = (u64) ~ 0; - is_outbound = 0; + remote_range_set = local_range_set = is_outbound = 0; if (!unformat_user (input, unformat_line_input, line_input)) return 0; @@ -247,6 +293,8 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, is_add = 1; else if (unformat (line_input, "del")) is_add = 0; + else if (unformat (line_input, "ip6")) + p.is_ipv6 = 1; else if (unformat (line_input, "spd %u", &p.id)) ; else if (unformat (line_input, "inbound")) @@ -273,37 +321,35 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, else if (unformat (line_input, "local-ip-range %U - %U", unformat_ip4_address, &p.laddr.start.ip4, unformat_ip4_address, &p.laddr.stop.ip4)) - ; + local_range_set = 1; else if (unformat (line_input, "remote-ip-range %U - %U", unformat_ip4_address, &p.raddr.start.ip4, unformat_ip4_address, &p.raddr.stop.ip4)) - ; + remote_range_set = 1; else if (unformat (line_input, "local-ip-range %U - %U", unformat_ip6_address, &p.laddr.start.ip6, unformat_ip6_address, &p.laddr.stop.ip6)) { p.is_ipv6 = 1; + local_range_set = 1; } else if (unformat (line_input, "remote-ip-range %U - %U", unformat_ip6_address, &p.raddr.start.ip6, unformat_ip6_address, &p.raddr.stop.ip6)) { p.is_ipv6 = 1; + remote_range_set = 1; } else if (unformat (line_input, "local-port-range %u - %u", &tmp, &tmp2)) { p.lport.start = tmp; p.lport.stop = tmp2; - p.lport.start = clib_host_to_net_u16 (p.lport.start); - p.lport.stop = clib_host_to_net_u16 (p.lport.stop); } else if (unformat (line_input, "remote-port-range %u - %u", &tmp, &tmp2)) { p.rport.start = tmp; p.rport.stop = tmp2; - p.rport.start = clib_host_to_net_u16 (p.rport.start); - p.rport.stop = clib_host_to_net_u16 (p.rport.stop); } else { @@ -313,26 +359,19 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, } } - /* Check if SA is for IPv6/AH which is not supported. Return error if TRUE. */ - if (p.sa_id) + if (!remote_range_set) { - uword *p1; - ipsec_main_t *im = &ipsec_main; - ipsec_sa_t *sa = 0; - p1 = hash_get (im->sa_index_by_sa_id, p.sa_id); - if (!p1) - { - error = - clib_error_return (0, "SA with index %u not found", p.sa_id); - goto done; - } - sa = pool_elt_at_index (im->sad, p1[0]); - if (sa && sa->protocol == IPSEC_PROTOCOL_AH && is_add && p.is_ipv6) - { - error = clib_error_return (0, "AH not supported for IPV6: '%U'", - format_unformat_error, line_input); - goto done; - } + if (p.is_ipv6) + clib_memset (&p.raddr.stop.ip6, 0xff, 16); + else + clib_memset (&p.raddr.stop.ip4, 0xff, 4); + } + if (!local_range_set) + { + if (p.is_ipv6) + clib_memset (&p.laddr.stop.ip6, 0xff, 16); + else + clib_memset (&p.laddr.stop.ip4, 0xff, 4); } rv = ipsec_policy_mk_type (is_outbound, p.is_ipv6, p.policy, &p.type); @@ -369,63 +408,16 @@ VLIB_CLI_COMMAND (ipsec_policy_add_del_command, static) = { }; /* *INDENT-ON* */ -static clib_error_t * -set_ipsec_sa_key_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ - unformat_input_t _line_input, *line_input = &_line_input; - ipsec_key_t ck = { }, ik = - { - }; - clib_error_t *error = NULL; - u32 id; - - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%u", &id)) - ; - else - if (unformat (line_input, "crypto-key %U", unformat_ipsec_key, &ck)) - ; - else if (unformat (line_input, "integ-key %U", unformat_ipsec_key, &ik)) - ; - else - { - error = clib_error_return (0, "parse error: '%U'", - format_unformat_error, line_input); - goto done; - } - } - - ipsec_set_sa_key (id, &ck, &ik); - -done: - unformat_free (line_input); - - return error; -} - -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (set_ipsec_sa_key_command, static) = { - .path = "set ipsec sa", - .short_help = "set ipsec sa crypto-key integ-key ", - .function = set_ipsec_sa_key_command_fn, -}; -/* *INDENT-ON* */ - static void -ipsec_sa_show_all (vlib_main_t * vm, ipsec_main_t * im) +ipsec_sa_show_all (vlib_main_t * vm, ipsec_main_t * im, u8 detail) { u32 sai; /* *INDENT-OFF* */ - pool_foreach_index (sai, im->sad, ({ - vlib_cli_output(vm, "%U", format_ipsec_sa, sai, IPSEC_FORMAT_BRIEF); - })); + pool_foreach_index (sai, im->sad) { + vlib_cli_output(vm, "%U", format_ipsec_sa, sai, + (detail ? IPSEC_FORMAT_DETAIL : IPSEC_FORMAT_BRIEF)); + } /* *INDENT-ON* */ } @@ -435,9 +427,9 @@ ipsec_spd_show_all (vlib_main_t * vm, ipsec_main_t * im) u32 spdi; /* *INDENT-OFF* */ - pool_foreach_index (spdi, im->spds, ({ + pool_foreach_index (spdi, im->spds) { vlib_cli_output(vm, "%U", format_ipsec_spd, spdi); - })); + } /* *INDENT-ON* */ } @@ -445,29 +437,32 @@ static void ipsec_spd_bindings_show_all (vlib_main_t * vm, ipsec_main_t * im) { u32 spd_id, sw_if_index; + ipsec_spd_t *spd; vlib_cli_output (vm, "SPD Bindings:"); /* *INDENT-OFF* */ hash_foreach(sw_if_index, spd_id, im->spd_index_by_sw_if_index, ({ - vlib_cli_output (vm, " %d -> %U", spd_id, + spd = pool_elt_at_index (im->spds, spd_id); + vlib_cli_output (vm, " %d -> %U", spd->id, format_vnet_sw_if_index_name, im->vnet_main, sw_if_index); })); /* *INDENT-ON* */ } -static void -ipsec_tunnel_show_all (vlib_main_t * vm, ipsec_main_t * im) +static walk_rc_t +ipsec_tun_protect_show_one (index_t itpi, void *ctx) { - u32 ti; + vlib_cli_output (ctx, "%U", format_ipsec_tun_protect_index, itpi); - vlib_cli_output (vm, "Tunnel interfaces"); - /* *INDENT-OFF* */ - pool_foreach_index (ti, im->tunnel_interfaces, ({ - vlib_cli_output(vm, " %U", format_ipsec_tunnel, ti); - })); - /* *INDENT-ON* */ + return (WALK_CONTINUE); +} + +static void +ipsec_tunnel_show_all (vlib_main_t * vm) +{ + ipsec_tun_protect_walk (ipsec_tun_protect_show_one, vm); } static clib_error_t * @@ -476,10 +471,13 @@ show_ipsec_command_fn (vlib_main_t * vm, { ipsec_main_t *im = &ipsec_main; - ipsec_sa_show_all (vm, im); + ipsec_sa_show_all (vm, im, 0); ipsec_spd_show_all (vm, im); ipsec_spd_bindings_show_all (vm, im); - ipsec_tunnel_show_all (vm, im); + ipsec_tun_protect_walk (ipsec_tun_protect_show_one, vm); + + vlib_cli_output (vm, "IPSec async mode: %s", + (im->async_mode ? "on" : "off")); return 0; } @@ -498,6 +496,33 @@ show_ipsec_sa_command_fn (vlib_main_t * vm, { ipsec_main_t *im = &ipsec_main; u32 sai = ~0; + u8 detail = 0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%u", &sai)) + ; + if (unformat (input, "detail")) + detail = 1; + else + break; + } + + if (~0 == sai) + ipsec_sa_show_all (vm, im, detail); + else + vlib_cli_output (vm, "%U", format_ipsec_sa, sai, + IPSEC_FORMAT_DETAIL | IPSEC_FORMAT_INSECURE); + + return 0; +} + +static clib_error_t * +clear_ipsec_sa_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + ipsec_main_t *im = &ipsec_main; + u32 sai = ~0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { @@ -508,9 +533,20 @@ show_ipsec_sa_command_fn (vlib_main_t * vm, } if (~0 == sai) - ipsec_sa_show_all (vm, im); + { + /* *INDENT-OFF* */ + pool_foreach_index (sai, im->sad) { + ipsec_sa_clear(sai); + } + /* *INDENT-ON* */ + } else - vlib_cli_output (vm, "%U", format_ipsec_sa, sai, IPSEC_FORMAT_DETAIL); + { + if (pool_is_free_index (im->sad, sai)) + return clib_error_return (0, "unknown SA index: %d", sai); + else + ipsec_sa_clear (sai); + } return 0; } @@ -521,6 +557,12 @@ VLIB_CLI_COMMAND (show_ipsec_sa_command, static) = { .short_help = "show ipsec sa [index]", .function = show_ipsec_sa_command_fn, }; + +VLIB_CLI_COMMAND (clear_ipsec_sa_command, static) = { + .path = "clear ipsec sa", + .short_help = "clear ipsec sa [index]", + .function = clear_ipsec_sa_command_fn, +}; /* *INDENT-ON* */ static clib_error_t * @@ -564,21 +606,7 @@ show_ipsec_tunnel_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - ipsec_main_t *im = &ipsec_main; - u32 ti = ~0; - - while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (input, "%u", &ti)) - ; - else - break; - } - - if (~0 != ti) - vlib_cli_output (vm, "%U", format_ipsec_tunnel, ti); - else - ipsec_tunnel_show_all (vm, im); + ipsec_tunnel_show_all (vm); return 0; } @@ -586,7 +614,7 @@ show_ipsec_tunnel_command_fn (vlib_main_t * vm, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_ipsec_tunnel_command, static) = { .path = "show ipsec tunnel", - .short_help = "show ipsec tunnel [index]", + .short_help = "show ipsec tunnel", .function = show_ipsec_tunnel_command_fn, }; /* *INDENT-ON* */ @@ -605,7 +633,7 @@ ipsec_show_backends_command_fn (vlib_main_t * vm, u8 *s = format (NULL, "%=25s %=25s %=10s\n", "Name", "Index", "Active"); ipsec_ah_backend_t *ab; /* *INDENT-OFF* */ - pool_foreach (ab, im->ah_backends, { + pool_foreach (ab, im->ah_backends) { s = format (s, "%=25s %=25u %=10s\n", ab->name, ab - im->ah_backends, ab - im->ah_backends == im->ah_current_backend ? "yes" : "no"); if (verbose) { @@ -619,7 +647,7 @@ ipsec_show_backends_command_fn (vlib_main_t * vm, n = vlib_get_node (vm, ab->ah6_decrypt_node_index); s = format (s, " dec6 %s (next %d)\n", n->name, ab->ah6_decrypt_next_index); } - }); + } /* *INDENT-ON* */ vlib_cli_output (vm, "%v", s); _vec_len (s) = 0; @@ -627,7 +655,7 @@ ipsec_show_backends_command_fn (vlib_main_t * vm, s = format (s, "%=25s %=25s %=10s\n", "Name", "Index", "Active"); ipsec_esp_backend_t *eb; /* *INDENT-OFF* */ - pool_foreach (eb, im->esp_backends, { + pool_foreach (eb, im->esp_backends) { s = format (s, "%=25s %=25u %=10s\n", eb->name, eb - im->esp_backends, eb - im->esp_backends == im->esp_current_backend ? "yes" : "no"); @@ -642,7 +670,7 @@ ipsec_show_backends_command_fn (vlib_main_t * vm, n = vlib_get_node (vm, eb->esp6_decrypt_node_index); s = format (s, " dec6 %s (next %d)\n", n->name, eb->esp6_decrypt_next_index); } - }); + } /* *INDENT-ON* */ vlib_cli_output (vm, "%v", s); @@ -747,231 +775,138 @@ VLIB_CLI_COMMAND (clear_ipsec_counters_command, static) = { /* *INDENT-ON* */ static clib_error_t * -create_ipsec_tunnel_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) +ipsec_tun_protect_cmd (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) { unformat_input_t _line_input, *line_input = &_line_input; - ipsec_add_del_tunnel_args_t a; - int rv; - u32 num_m_args = 0; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - clib_error_t *error = NULL; - ipsec_key_t rck = { 0 }; - ipsec_key_t lck = { 0 }; - ipsec_key_t lik = { 0 }; - ipsec_key_t rik = { 0 }; + u32 sw_if_index, is_del, sa_in, sa_out, *sa_ins = NULL; + ip_address_t peer = { }; + vnet_main_t *vnm; - clib_memset (&a, 0, sizeof (a)); - a.is_add = 1; + is_del = 0; + sw_if_index = ~0; + vnm = vnet_get_main (); - /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) return 0; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat - (line_input, "local-ip %U", unformat_ip46_address, &a.local_ip, - IP46_TYPE_ANY)) - { - ip46_address_is_ip4 (&a.local_ip) ? (ipv4_set = 1) : (ipv6_set = 1); - num_m_args++; - } - else - if (unformat - (line_input, "remote-ip %U", unformat_ip46_address, &a.remote_ip, - IP46_TYPE_ANY)) - { - ip46_address_is_ip4 (&a.remote_ip) ? (ipv4_set = 1) : (ipv6_set = - 1); - num_m_args++; - } - else if (unformat (line_input, "local-spi %u", &a.local_spi)) - num_m_args++; - else if (unformat (line_input, "remote-spi %u", &a.remote_spi)) - num_m_args++; - else if (unformat (line_input, "instance %u", &a.show_instance)) - a.renumber = 1; - else if (unformat (line_input, "salt 0x%x", &a.salt)) + if (unformat (line_input, "del")) + is_del = 1; + else if (unformat (line_input, "add")) + is_del = 0; + else if (unformat (line_input, "sa-in %d", &sa_in)) + vec_add1 (sa_ins, sa_in); + else if (unformat (line_input, "sa-out %d", &sa_out)) ; - else if (unformat (line_input, "udp-encap")) - a.udp_encap = 1; - else if (unformat (line_input, "use-esn")) - a.esn = 1; - else if (unformat (line_input, "use-anti-replay")) - a.anti_replay = 1; - else if (unformat (line_input, "tx-table %u", &a.tx_table_id)) - ; - else - if (unformat - (line_input, "local-crypto-key %U", unformat_ipsec_key, &lck)) + else if (unformat (line_input, "%U", + unformat_vnet_sw_interface, vnm, &sw_if_index)) ; - else - if (unformat - (line_input, "remote-crypto-key %U", unformat_ipsec_key, &rck)) - ; - else if (unformat (line_input, "crypto-alg %U", - unformat_ipsec_crypto_alg, &a.crypto_alg)) + else if (unformat (line_input, "%U", unformat_ip_address, &peer)) ; else - if (unformat - (line_input, "local-integ-key %U", unformat_ipsec_key, &lik)) - ; - else - if (unformat - (line_input, "remote-integ-key %U", unformat_ipsec_key, &rik)) - ; - else if (unformat (line_input, "integ-alg %U", - unformat_ipsec_integ_alg, &a.integ_alg)) - ; - else if (unformat (line_input, "del")) - a.is_add = 0; - else - { - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, line_input); - goto done; - } - } - - if (num_m_args < 4) - { - error = clib_error_return (0, "mandatory argument(s) missing"); - goto done; + return (clib_error_return (0, "unknown input '%U'", + format_unformat_error, line_input)); } - if (ipv4_set && ipv6_set) - return clib_error_return (0, "both IPv4 and IPv6 addresses specified"); - - a.is_ip6 = ipv6_set; - - clib_memcpy (a.local_crypto_key, lck.data, lck.len); - a.local_crypto_key_len = lck.len; - clib_memcpy (a.remote_crypto_key, rck.data, rck.len); - a.remote_crypto_key_len = rck.len; + if (!is_del) + ipsec_tun_protect_update (sw_if_index, &peer, sa_out, sa_ins); + else + ipsec_tun_protect_del (sw_if_index, &peer); - clib_memcpy (a.local_integ_key, lik.data, lik.len); - a.local_integ_key_len = lck.len; - clib_memcpy (a.remote_integ_key, rik.data, rik.len); - a.remote_integ_key_len = rck.len; + unformat_free (line_input); + return NULL; +} - rv = ipsec_add_del_tunnel_if (&a); +/** + * Protect tunnel with IPSEC + */ +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (ipsec_tun_protect_cmd_node, static) = +{ + .path = "ipsec tunnel protect", + .function = ipsec_tun_protect_cmd, + .short_help = "ipsec tunnel protect input-sa output-sa [add|del]", + // this is not MP safe +}; +/* *INDENT-ON* */ - switch (rv) - { - case 0: - break; - case VNET_API_ERROR_INVALID_VALUE: - if (a.is_add) - error = clib_error_return (0, - "IPSec tunnel interface already exists..."); - else - error = clib_error_return (0, "IPSec tunnel interface not exists..."); - goto done; - default: - error = clib_error_return (0, "ipsec_register_interface returned %d", - rv); - goto done; - } -done: - unformat_free (line_input); +static clib_error_t * +ipsec_tun_protect_show (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + ipsec_tun_protect_walk (ipsec_tun_protect_show_one, vm); - return error; + return NULL; } +/** + * show IPSEC tunnel protection + */ /* *INDENT-OFF* */ -VLIB_CLI_COMMAND (create_ipsec_tunnel_command, static) = { - .path = "create ipsec tunnel", - .short_help = "create ipsec tunnel local-ip local-spi " - "remote-ip remote-spi [instance ] [udp-encap] [use-esn] [use-anti-replay] " - "[tx-table ]", - .function = create_ipsec_tunnel_command_fn, +VLIB_CLI_COMMAND (ipsec_tun_protect_show_node, static) = +{ + .path = "show ipsec protect", + .function = ipsec_tun_protect_show, + .short_help = "show ipsec protect", }; /* *INDENT-ON* */ -static clib_error_t * -set_interface_key_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) +static int +ipsec_tun_protect4_hash_show_one (clib_bihash_kv_8_16_t * kv, void *arg) { - unformat_input_t _line_input, *line_input = &_line_input; - ipsec_main_t *im = &ipsec_main; - ipsec_if_set_key_type_t type = IPSEC_IF_SET_KEY_TYPE_NONE; - u32 hw_if_index = (u32) ~ 0; - u32 alg; - u8 *key = 0; - clib_error_t *error = NULL; + ipsec4_tunnel_kv_t *ikv = (ipsec4_tunnel_kv_t *) kv; + vlib_main_t *vm = arg; - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; + vlib_cli_output (vm, " %U", format_ipsec4_tunnel_kv, ikv); - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "%U", - unformat_vnet_hw_interface, im->vnet_main, &hw_if_index)) - ; - else - if (unformat - (line_input, "local crypto %U", unformat_ipsec_crypto_alg, &alg)) - type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO; - else - if (unformat - (line_input, "remote crypto %U", unformat_ipsec_crypto_alg, &alg)) - type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO; - else - if (unformat - (line_input, "local integ %U", unformat_ipsec_integ_alg, &alg)) - type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG; - else - if (unformat - (line_input, "remote integ %U", unformat_ipsec_integ_alg, &alg)) - type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG; - else if (unformat (line_input, "%U", unformat_hex_string, &key)) - ; - else - { - error = clib_error_return (0, "parse error: '%U'", - format_unformat_error, line_input); - goto done; - } - } + return (BIHASH_WALK_CONTINUE); +} - if (type == IPSEC_IF_SET_KEY_TYPE_NONE) - { - error = clib_error_return (0, "unknown key type"); - goto done; - } +static int +ipsec_tun_protect6_hash_show_one (clib_bihash_kv_24_16_t * kv, void *arg) +{ + ipsec6_tunnel_kv_t *ikv = (ipsec6_tunnel_kv_t *) kv; + vlib_main_t *vm = arg; - if (alg > 0 && vec_len (key) == 0) - { - error = clib_error_return (0, "key is not specified"); - goto done; - } + vlib_cli_output (vm, " %U", format_ipsec6_tunnel_kv, ikv); - if (hw_if_index == (u32) ~ 0) - { - error = clib_error_return (0, "interface not specified"); - goto done; - } + return (BIHASH_WALK_CONTINUE); +} - ipsec_set_interface_key (im->vnet_main, hw_if_index, type, alg, key); +static clib_error_t * +ipsec_tun_protect_hash_show (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + ipsec_main_t *im = &ipsec_main; -done: - vec_free (key); - unformat_free (line_input); + { + vlib_cli_output (vm, "IPv4:"); - return error; + clib_bihash_foreach_key_value_pair_8_16 + (&im->tun4_protect_by_key, ipsec_tun_protect4_hash_show_one, vm); + + vlib_cli_output (vm, "IPv6:"); + + clib_bihash_foreach_key_value_pair_24_16 + (&im->tun6_protect_by_key, ipsec_tun_protect6_hash_show_one, vm); + } + + return NULL; } +/** + * show IPSEC tunnel protection hash tables + */ /* *INDENT-OFF* */ -VLIB_CLI_COMMAND (set_interface_key_command, static) = { - .path = "set interface ipsec key", - .short_help = - "set interface ipsec key ", - .function = set_interface_key_command_fn, +VLIB_CLI_COMMAND (ipsec_tun_protect_hash_show_node, static) = +{ + .path = "show ipsec protect-hash", + .function = ipsec_tun_protect_hash_show, + .short_help = "show ipsec protect-hash", }; /* *INDENT-ON* */ @@ -983,6 +918,41 @@ ipsec_cli_init (vlib_main_t * vm) VLIB_INIT_FUNCTION (ipsec_cli_init); +static clib_error_t * +set_async_mode_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + int async_enable = 0; + + if (!unformat_user (input, unformat_line_input, line_input)) + return 0; + + while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (line_input, "on")) + async_enable = 1; + else if (unformat (line_input, "off")) + async_enable = 0; + else + return (clib_error_return (0, "unknown input '%U'", + format_unformat_error, line_input)); + } + + vnet_crypto_request_async_mode (async_enable); + ipsec_set_async_mode (async_enable); + + unformat_free (line_input); + return (NULL); +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (set_async_mode_command, static) = { + .path = "set ipsec async mode", + .short_help = "set ipsec async mode on|off", + .function = set_async_mode_command_fn, +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON