X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_cli.c;h=2c7a923adc37079a3fa5ae99f122509bf40e2327;hb=f16e9a550;hp=7779e79f067a81607d11e6948eebaedf69c61fcb;hpb=e5d34919b4561a5ee11e41dec6b0184537b39696;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c index 7779e79f067..2c7a923adc3 100644 --- a/src/vnet/ipsec/ipsec_cli.c +++ b/src/vnet/ipsec/ipsec_cli.c @@ -36,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; @@ -53,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); @@ -76,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; @@ -86,8 +93,12 @@ 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; @@ -96,6 +107,7 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, 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; @@ -103,11 +115,17 @@ 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)) - ; + m_args |= 1 << 1; else if (unformat (line_input, "salt 0x%x", &salt)) ; else if (unformat (line_input, "esp")) @@ -125,18 +143,26 @@ 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 if (unformat (line_input, "async")) + flags |= IPSEC_SA_FLAG_IS_ASYNC; else { error = clib_error_return (0, "parse error: '%U'", @@ -144,18 +170,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_and_lock (id, spi, proto, crypto_alg, - &ck, integ_alg, &ik, flags, - 0, clib_host_to_net_u32 (salt), - &tun_src, &tun_dst, NULL, - IPSEC_UDP_PORT_NONE); + { + 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_unlock_id (id); + { + rv = ipsec_sa_unlock_id (id); + } if (rv) - error = clib_error_return (0, "failed"); + error = clib_error_return (0, "failed: %d", rv); done: unformat_free (line_input); @@ -233,13 +278,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; - is_outbound = 0; + remote_range_set = local_range_set = is_outbound = 0; if (!unformat_user (input, unformat_line_input, line_input)) return 0; @@ -250,6 +295,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")) @@ -276,22 +323,24 @@ 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)) { @@ -312,6 +361,21 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, } } + if (!remote_range_set) + { + 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); if (rv) @@ -352,10 +416,11 @@ 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, - (detail ? IPSEC_FORMAT_DETAIL : IPSEC_FORMAT_BRIEF)); - })); + pool_foreach_index (sai, ipsec_sa_pool) + { + vlib_cli_output (vm, "%U", format_ipsec_sa, sai, + (detail ? IPSEC_FORMAT_DETAIL : IPSEC_FORMAT_BRIEF)); + } /* *INDENT-ON* */ } @@ -365,9 +430,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* */ } @@ -414,6 +479,9 @@ show_ipsec_command_fn (vlib_main_t * vm, ipsec_spd_bindings_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; } @@ -456,7 +524,6 @@ 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) @@ -470,14 +537,15 @@ clear_ipsec_sa_command_fn (vlib_main_t * vm, if (~0 == sai) { /* *INDENT-OFF* */ - pool_foreach_index (sai, im->sad, ({ - ipsec_sa_clear(sai); - })); + pool_foreach_index (sai, ipsec_sa_pool) + { + ipsec_sa_clear (sai); + } /* *INDENT-ON* */ } else { - if (pool_is_free_index (im->sad, sai)) + if (pool_is_free_index (ipsec_sa_pool, sai)) return clib_error_return (0, "unknown SA index: %d", sai); else ipsec_sa_clear (sai); @@ -568,7 +636,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) { @@ -582,7 +650,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; @@ -590,7 +658,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"); @@ -605,7 +673,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); @@ -709,197 +777,6 @@ VLIB_CLI_COMMAND (clear_ipsec_counters_command, static) = { }; /* *INDENT-ON* */ -static u32 -ipsec_tun_mk_local_sa_id (u32 ti) -{ - return (0x80000000 | ti); -} - -static u32 -ipsec_tun_mk_remote_sa_id (u32 ti) -{ - return (0xc0000000 | ti); -} - -static clib_error_t * -create_ipsec_tunnel_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) -{ - unformat_input_t _line_input, *line_input = &_line_input; - ip46_address_t local_ip = ip46_address_initializer; - ip46_address_t remote_ip = ip46_address_initializer; - ip_address_t nh = IP_ADDRESS_V4_ALL_0S; - ipsec_crypto_alg_t crypto_alg = IPSEC_CRYPTO_ALG_NONE; - ipsec_integ_alg_t integ_alg = IPSEC_INTEG_ALG_NONE; - ipsec_sa_flags_t flags; - u32 local_spi, remote_spi, salt, table_id, fib_index; - u32 instance = ~0; - int rv; - u32 num_m_args = 0; - u8 ipv4_set = 0; - u8 ipv6_set = 0; - u8 is_add = 1; - 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 }; - - table_id = 0; - flags = IPSEC_SA_FLAG_NONE; - - /* 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, &local_ip, - IP46_TYPE_ANY)) - { - ip46_address_is_ip4 (&local_ip) ? (ipv4_set = 1) : (ipv6_set = 1); - num_m_args++; - } - else - if (unformat - (line_input, "remote-ip %U", unformat_ip46_address, &remote_ip, - IP46_TYPE_ANY)) - { - ip46_address_is_ip4 (&remote_ip) ? (ipv4_set = 1) : (ipv6_set = 1); - num_m_args++; - } - else if (unformat (line_input, "local-spi %u", &local_spi)) - num_m_args++; - else if (unformat (line_input, "remote-spi %u", &remote_spi)) - num_m_args++; - else if (unformat (line_input, "salt 0x%x", &salt)) - ; - else if (unformat (line_input, "udp-encap")) - flags |= IPSEC_SA_FLAG_UDP_ENCAP; - else if (unformat (line_input, "use-esn")) - flags |= IPSEC_SA_FLAG_USE_ESN; - else if (unformat (line_input, "use-anti-replay")) - flags |= IPSEC_SA_FLAG_USE_ANTI_REPLAY; - else if (unformat (line_input, "instance %u", &instance)) - ; - else if (unformat (line_input, "tx-table %u", &table_id)) - ; - else - if (unformat - (line_input, "local-crypto-key %U", unformat_ipsec_key, &lck)) - ; - 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, &crypto_alg)) - ; - 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, &integ_alg)) - ; - else if (unformat (line_input, "del")) - is_add = 0; - else if (unformat (line_input, "nh &U", unformat_ip_address, &nh)) - ; - 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; - } - - if (ipv4_set && ipv6_set) - return clib_error_return (0, "both IPv4 and IPv6 addresses specified"); - - fib_index = fib_table_find (fib_ip_proto (ipv6_set), table_id); - - if (~0 == fib_index) - { - rv = VNET_API_ERROR_NO_SUCH_FIB; - goto done; - } - - if (is_add) - { - // remote = input, local = output - u32 sw_if_index; - - /* create an ip-ip tunnel, then the two SA, then bind them */ - rv = - ipip_add_tunnel (ipv6_set ? IPIP_TRANSPORT_IP6 : IPIP_TRANSPORT_IP4, - instance, &local_ip, &remote_ip, fib_index, - TUNNEL_ENCAP_DECAP_FLAG_NONE, IP_DSCP_CS0, - TUNNEL_MODE_P2P, &sw_if_index); - rv |= - ipsec_sa_add_and_lock (ipsec_tun_mk_local_sa_id (sw_if_index), - local_spi, IPSEC_PROTOCOL_ESP, crypto_alg, - &lck, integ_alg, &lik, flags, table_id, - clib_host_to_net_u32 (salt), &local_ip, - &remote_ip, NULL, IPSEC_UDP_PORT_NONE); - rv |= - ipsec_sa_add_and_lock (ipsec_tun_mk_remote_sa_id (sw_if_index), - remote_spi, IPSEC_PROTOCOL_ESP, crypto_alg, - &rck, integ_alg, &rik, - (flags | IPSEC_SA_FLAG_IS_INBOUND), table_id, - clib_host_to_net_u32 (salt), &remote_ip, - &local_ip, NULL, IPSEC_UDP_PORT_NONE); - rv |= - ipsec_tun_protect_update_one (sw_if_index, &nh, - ipsec_tun_mk_local_sa_id (sw_if_index), - ipsec_tun_mk_remote_sa_id - (sw_if_index)); - } - else - rv = 0; - - switch (rv) - { - case 0: - break; - case VNET_API_ERROR_INVALID_VALUE: - error = clib_error_return (0, - "IPSec tunnel interface already exists..."); - goto done; - default: - error = clib_error_return (0, "ipsec_register_interface returned %d", - rv); - goto done; - } - -done: - unformat_free (line_input); - - return error; -} - -/* *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, -}; -/* *INDENT-ON* */ - static clib_error_t * ipsec_tun_protect_cmd (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) @@ -938,6 +815,8 @@ ipsec_tun_protect_cmd (vlib_main_t * vm, if (!is_del) ipsec_tun_protect_update (sw_if_index, &peer, sa_out, sa_ins); + else + ipsec_tun_protect_del (sw_if_index, &peer); unformat_free (line_input); return NULL; @@ -951,7 +830,7 @@ 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 ", + .short_help = "ipsec tunnel protect input-sa output-sa [add|del]", // this is not MP safe }; /* *INDENT-ON* */ @@ -978,6 +857,28 @@ VLIB_CLI_COMMAND (ipsec_tun_protect_show_node, static) = }; /* *INDENT-ON* */ +static int +ipsec_tun_protect4_hash_show_one (clib_bihash_kv_8_16_t * kv, void *arg) +{ + ipsec4_tunnel_kv_t *ikv = (ipsec4_tunnel_kv_t *) kv; + vlib_main_t *vm = arg; + + vlib_cli_output (vm, " %U", format_ipsec4_tunnel_kv, ikv); + + return (BIHASH_WALK_CONTINUE); +} + +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; + + vlib_cli_output (vm, " %U", format_ipsec6_tunnel_kv, ikv); + + return (BIHASH_WALK_CONTINUE); +} + static clib_error_t * ipsec_tun_protect_hash_show (vlib_main_t * vm, unformat_input_t * input, @@ -986,33 +887,15 @@ ipsec_tun_protect_hash_show (vlib_main_t * vm, ipsec_main_t *im = &ipsec_main; { - ipsec_tun_lkup_result_t value; - ipsec4_tunnel_key_t key; - vlib_cli_output (vm, "IPv4:"); - /* *INDENT-OFF* */ - hash_foreach(key.as_u64, value.as_u64, im->tun4_protect_by_key, - ({ - vlib_cli_output (vm, " %U", format_ipsec4_tunnel_key, &key); - vlib_cli_output (vm, " tun:%d sa:%d", value.tun_index, value.sa_index); - })); - /* *INDENT-ON* */ - } - - { - ipsec_tun_lkup_result_t value; - ipsec6_tunnel_key_t *key; + 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:"); - /* *INDENT-OFF* */ - hash_foreach_mem(key, value.as_u64, im->tun6_protect_by_key, - ({ - vlib_cli_output (vm, " %U", format_ipsec6_tunnel_key, key); - vlib_cli_output (vm, " tun:%d sa:%d", value.tun_index, value.sa_index); - })); - /* *INDENT-ON* */ + clib_bihash_foreach_key_value_pair_24_16 + (&im->tun6_protect_by_key, ipsec_tun_protect6_hash_show_one, vm); } return NULL; @@ -1038,6 +921,40 @@ 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)); + } + + 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