X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_cli.c;h=36ea6145993f3f8754e8464e467a37b8194a4c76;hb=e6be702362299566990678f505512b1b74b49112;hp=0f47c7b84276ddff1cbd9965b95f018ed1be5642;hpb=1ba5bc8d888d0164dd6e38857cbed09ab7ce1d8b;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c index 0f47c7b8427..36ea6145993 100644 --- a/src/vnet/ipsec/ipsec_cli.c +++ b/src/vnet/ipsec/ipsec_cli.c @@ -84,13 +84,15 @@ 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; int is_add, rv; - u32 id, spi; 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; if (!unformat_user (input, unformat_line_input, line_input)) return 0; @@ -103,6 +105,8 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, is_add = 0; else if (unformat (line_input, "spi %u", &spi)) ; + else if (unformat (line_input, "salt %u", &salt)) + ; else if (unformat (line_input, "esp")) proto = IPSEC_PROTOCOL_ESP; else if (unformat (line_input, "ah")) @@ -141,12 +145,13 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm, if (is_add) rv = ipsec_sa_add (id, spi, proto, crypto_alg, &ck, integ_alg, &ik, flags, - 0, &tun_src, &tun_dst, NULL); + 0, clib_host_to_net_u32 (salt), + &tun_src, &tun_dst, NULL); else rv = ipsec_sa_del (id); if (rv) - clib_error_return (0, "failed"); + error = clib_error_return (0, "failed"); done: unformat_free (line_input); @@ -230,9 +235,6 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, 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; if (!unformat_user (input, unformat_line_input, line_input)) @@ -310,28 +312,6 @@ 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) - { - 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; - } - } - rv = ipsec_policy_mk_type (is_outbound, p.is_ipv6, p.policy, &p.type); if (rv) @@ -372,8 +352,10 @@ set_ipsec_sa_key_command_fn (vlib_main_t * vm, vlib_cli_command_t * cmd) { unformat_input_t _line_input, *line_input = &_line_input; + ipsec_key_t ck = { }, ik = + { + }; clib_error_t *error = NULL; - ipsec_key_t ck, ik; u32 id; if (!unformat_user (input, unformat_line_input, line_input)) @@ -407,70 +389,185 @@ done: /* *INDENT-OFF* */ VLIB_CLI_COMMAND (set_ipsec_sa_key_command, static) = { .path = "set ipsec sa", - .short_help = - "set ipsec sa crypto-key integ-key ", + .short_help = "set ipsec sa crypto-key integ-key ", .function = set_ipsec_sa_key_command_fn, }; /* *INDENT-ON* */ -static clib_error_t * -show_ipsec_command_fn (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) +static void +ipsec_sa_show_all (vlib_main_t * vm, ipsec_main_t * im) { - ipsec_main_t *im = &ipsec_main; - u32 spd_id, sw_if_index, sai; - vnet_hw_interface_t *hi; - ipsec_tunnel_if_t *t; - u8 *protocol = NULL; - u8 *policy = NULL; - u32 i; + u32 sai; /* *INDENT-OFF* */ pool_foreach_index (sai, im->sad, ({ - vlib_cli_output(vm, "%U", format_ipsec_sa, sai); + vlib_cli_output(vm, "%U", format_ipsec_sa, sai, IPSEC_FORMAT_BRIEF); })); - pool_foreach_index (i, im->spds, ({ - vlib_cli_output(vm, "%U", format_ipsec_spd, i); + /* *INDENT-ON* */ +} + +static void +ipsec_spd_show_all (vlib_main_t * vm, ipsec_main_t * im) +{ + u32 spdi; + + /* *INDENT-OFF* */ + pool_foreach_index (spdi, im->spds, ({ + vlib_cli_output(vm, "%U", format_ipsec_spd, spdi); })); + /* *INDENT-ON* */ +} + +static void +ipsec_spd_bindings_show_all (vlib_main_t * vm, ipsec_main_t * im) +{ + u32 spd_id, sw_if_index; 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, format_vnet_sw_if_index_name, im->vnet_main, sw_if_index); })); /* *INDENT-ON* */ +} - vlib_cli_output (vm, "tunnel interfaces"); +static void +ipsec_tunnel_show_all (vlib_main_t * vm, ipsec_main_t * im) +{ + u32 ti; + + vlib_cli_output (vm, "Tunnel interfaces"); /* *INDENT-OFF* */ - pool_foreach (t, im->tunnel_interfaces, ({ - if (t->hw_if_index == ~0) - continue; - hi = vnet_get_hw_interface (im->vnet_main, t->hw_if_index); + pool_foreach_index (ti, im->tunnel_interfaces, ({ + vlib_cli_output(vm, " %U", format_ipsec_tunnel, ti); + })); + /* *INDENT-ON* */ +} - vlib_cli_output(vm, " %s", hi->name); +static clib_error_t * +show_ipsec_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + ipsec_main_t *im = &ipsec_main; - vlib_cli_output(vm, " out-bound sa"); - vlib_cli_output(vm, " %U", format_ipsec_sa, t->output_sa_index); + ipsec_sa_show_all (vm, im); + ipsec_spd_show_all (vm, im); + ipsec_spd_bindings_show_all (vm, im); + ipsec_tunnel_show_all (vm, im); - vlib_cli_output(vm, " in-bound sa"); - vlib_cli_output(vm, " %U", format_ipsec_sa, t->input_sa_index); - })); - vec_free(policy); - vec_free(protocol); - /* *INDENT-ON* */ return 0; } /* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_ipsec_command, static) = { - .path = "show ipsec", - .short_help = "show ipsec [backends]", + .path = "show ipsec all", + .short_help = "show ipsec all", .function = show_ipsec_command_fn, }; /* *INDENT-ON* */ +static clib_error_t * +show_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) + { + if (unformat (input, "%u", &sai)) + ; + else + break; + } + + if (~0 == sai) + ipsec_sa_show_all (vm, im); + else + vlib_cli_output (vm, "%U", format_ipsec_sa, sai, IPSEC_FORMAT_DETAIL); + + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_ipsec_sa_command, static) = { + .path = "show ipsec sa", + .short_help = "show ipsec sa [index]", + .function = show_ipsec_sa_command_fn, +}; +/* *INDENT-ON* */ + +static clib_error_t * +show_ipsec_spd_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + ipsec_main_t *im = &ipsec_main; + u8 show_bindings = 0; + u32 spdi = ~0; + + while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) + { + if (unformat (input, "%u", &spdi)) + ; + else if (unformat (input, "bindings")) + show_bindings = 1; + else + break; + } + + if (show_bindings) + ipsec_spd_bindings_show_all (vm, im); + else if (~0 != spdi) + vlib_cli_output (vm, "%U", format_ipsec_spd, spdi); + else + ipsec_spd_show_all (vm, im); + + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_ipsec_spd_command, static) = { + .path = "show ipsec spd", + .short_help = "show ipsec spd [index]", + .function = show_ipsec_spd_command_fn, +}; +/* *INDENT-ON* */ + +static clib_error_t * +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); + + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_ipsec_tunnel_command, static) = { + .path = "show ipsec tunnel", + .short_help = "show ipsec tunnel [index]", + .function = show_ipsec_tunnel_command_fn, +}; +/* *INDENT-ON* */ + static clib_error_t * ipsec_show_backends_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -543,17 +640,16 @@ ipsec_select_backend_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - u32 backend_index; + unformat_input_t _line_input, *line_input = &_line_input; ipsec_main_t *im = &ipsec_main; + clib_error_t *error; + u32 backend_index; - if (pool_elts (im->sad) > 0) - { - return clib_error_return (0, - "Cannot change IPsec backend, while %u SA entries are configured", - pool_elts (im->sad)); - } + error = ipsec_rsc_in_use (im); + + if (error) + return error; - unformat_input_t _line_input, *line_input = &_line_input; /* Get a line of input. */ if (!unformat_user (input, unformat_line_input, line_input)) return 0; @@ -675,6 +771,8 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm, 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)) + ; else if (unformat (line_input, "udp-encap")) a.udp_encap = 1; else if (unformat (line_input, "use-esn")) @@ -700,7 +798,7 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm, ; else if (unformat - (line_input, "rmote-integ-key %U", unformat_ipsec_key, &rik)) + (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))