X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipsec%2Fipsec_cli.c;h=096060865e97321824a8dac42f7cfbd65942740f;hb=47feb1146ec3b0e1cf2ebd83cd5211e1df261194;hp=8a4d068f9f70b366c56809d4217b6fb9acede046;hpb=9f231d4f147c7e3fdf562680488ec5dfe7655b5e;p=vpp.git diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c index 8a4d068f9f7..096060865e9 100644 --- a/src/vnet/ipsec/ipsec_cli.c +++ b/src/vnet/ipsec/ipsec_cli.c @@ -141,7 +141,7 @@ 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, 0, &tun_src, &tun_dst, NULL); else rv = ipsec_sa_del (id); @@ -291,12 +291,16 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm, { 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 { @@ -403,70 +407,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, @@ -671,6 +790,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")) @@ -717,12 +838,11 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm, goto done; } - if (ipv6_set) - return clib_error_return (0, "currently only IPv4 supported"); - 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);