X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fikev2%2Fikev2_cli.c;h=687e6f24d87b4b3a56761d01565482fdc0a8e335;hb=459d17bb7;hp=2ca1a5ccfc683a4a4cbf2d8369252029bd527774;hpb=8ebcb7a99d7b73a1ee5874780b4efdc69d32c82f;p=vpp.git diff --git a/src/plugins/ikev2/ikev2_cli.c b/src/plugins/ikev2/ikev2_cli.c index 2ca1a5ccfc6..687e6f24d87 100644 --- a/src/plugins/ikev2/ikev2_cli.c +++ b/src/plugins/ikev2/ikev2_cli.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -87,9 +88,12 @@ show_ikev2_sa_command_fn (vlib_main_t * vm, vlib_cli_output(vm, " SK_d %U", format_hex_bytes, sa->sk_d, vec_len(sa->sk_d)); - vlib_cli_output(vm, " SK_a i:%U\n r:%U", - format_hex_bytes, sa->sk_ai, vec_len(sa->sk_ai), - format_hex_bytes, sa->sk_ar, vec_len(sa->sk_ar)); + if (sa->sk_ai) + { + vlib_cli_output(vm, " SK_a i:%U\n r:%U", + format_hex_bytes, sa->sk_ai, vec_len(sa->sk_ai), + format_hex_bytes, sa->sk_ar, vec_len(sa->sk_ar)); + } vlib_cli_output(vm, " SK_e i:%U\n r:%U", format_hex_bytes, sa->sk_ei, vec_len(sa->sk_ei), format_hex_bytes, sa->sk_er, vec_len(sa->sk_er)); @@ -125,10 +129,13 @@ show_ikev2_sa_command_fn (vlib_main_t * vm, vlib_cli_output(vm, " SK_e i:%U\n r:%U", format_hex_bytes, child->sk_ei, vec_len(child->sk_ei), format_hex_bytes, child->sk_er, vec_len(child->sk_er)); - vlib_cli_output(vm, " SK_a i:%U\n r:%U", - format_hex_bytes, child->sk_ai, vec_len(child->sk_ai), - format_hex_bytes, child->sk_ar, vec_len(child->sk_ar)); - vlib_cli_output(vm, " traffic selectors (i):"); + if (child->sk_ai) + { + vlib_cli_output(vm, " SK_a i:%U\n r:%U", + format_hex_bytes, child->sk_ai, vec_len(child->sk_ai), + format_hex_bytes, child->sk_ar, vec_len(child->sk_ar)); + vlib_cli_output(vm, " traffic selectors (i):"); + } vec_foreach(ts, child->tsi) { vlib_cli_output(vm, " %u type %u protocol_id %u addr " @@ -184,6 +191,7 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm, ip4_address_t ip4; ip4_address_t end_addr; u32 responder_sw_if_index = (u32) ~ 0; + u32 tun_sw_if_index = (u32) ~ 0; ip4_address_t responder_ip4; ikev2_transform_encr_type_t crypto_alg; ikev2_transform_integ_type_t integ_alg; @@ -326,6 +334,13 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm, responder_ip4); goto done; } + else if (unformat (line_input, "set %U tunnel %U", + unformat_token, valid_chars, &name, + unformat_vnet_sw_interface, vnm, &tun_sw_if_index)) + { + r = ikev2_set_profile_tunnel_interface (vm, name, tun_sw_if_index); + goto done; + } else if (unformat (line_input, @@ -343,17 +358,40 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm, else if (unformat (line_input, - "set %U esp-crypto-alg %U %u esp-integ-alg %U esp-dh %U", + "set %U ike-crypto-alg %U %u ike-dh %U", unformat_token, valid_chars, &name, unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1, - unformat_ikev2_transform_integ_type, &integ_alg, unformat_ikev2_transform_dh_type, &dh_type)) { r = - ikev2_set_profile_esp_transforms (vm, name, crypto_alg, integ_alg, + ikev2_set_profile_ike_transforms (vm, name, crypto_alg, + IKEV2_TRANSFORM_INTEG_TYPE_NONE, dh_type, tmp1); goto done; } + else + if (unformat + (line_input, + "set %U esp-crypto-alg %U %u esp-integ-alg %U", + unformat_token, valid_chars, &name, + unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1, + unformat_ikev2_transform_integ_type, &integ_alg)) + { + r = + ikev2_set_profile_esp_transforms (vm, name, crypto_alg, integ_alg, + tmp1); + goto done; + } + else if (unformat + (line_input, + "set %U esp-crypto-alg %U %u", + unformat_token, valid_chars, &name, + unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1)) + { + r = + ikev2_set_profile_esp_transforms (vm, name, crypto_alg, 0, tmp1); + goto done; + } else if (unformat (line_input, "set %U sa-lifetime %lu %u %u %lu", unformat_token, valid_chars, &name, &tmp4, &tmp1, &tmp2, &tmp5)) @@ -362,6 +400,20 @@ ikev2_profile_add_del_command_fn (vlib_main_t * vm, ikev2_set_profile_sa_lifetime (vm, name, tmp4, tmp1, tmp2, tmp5); goto done; } + else if (unformat (line_input, "set %U udp-encap", + unformat_token, valid_chars, &name)) + { + r = ikev2_set_profile_udp_encap (vm, name); + goto done; + } + else if (unformat (line_input, "set %U ipsec-over-udp port %u", + unformat_token, valid_chars, &name, &tmp1)) + { + int rv = ikev2_set_profile_ipsec_udp_port (vm, name, tmp1, 1); + if (rv) + r = clib_error_return (0, "Error: %U", format_vnet_api_errno, rv); + goto done; + } else break; } @@ -384,12 +436,15 @@ VLIB_CLI_COMMAND (ikev2_profile_add_del_command, static) = { "ikev2 profile set auth [rsa-sig|shared-key-mic] [cert-file|string|hex]" " \n" "ikev2 profile set id \n" + "ikev2 profile set tunnel \n" + "ikev2 profile set udp-encap\n" "ikev2 profile set traffic-selector ip-range " " - port-range - " "protocol \n" "ikev2 profile set responder \n" "ikev2 profile set ike-crypto-alg ike-integ-alg ike-dh \n" - "ikev2 profile set esp-crypto-alg esp-integ-alg esp-dh \n" + "ikev2 profile set esp-crypto-alg " + "[esp-integ-alg ]\n" "ikev2 profile set sa-lifetime ", .function = ikev2_profile_add_del_command_fn, }; @@ -465,6 +520,32 @@ show_ikev2_profile_command_fn (vlib_main_t * vm, format_ip4_address, &p->rem_ts.end_addr, p->rem_ts.start_port, p->rem_ts.end_port, p->rem_ts.protocol_id); + if (~0 != p->tun_itf) + vlib_cli_output(vm, " protected tunnel %U", + format_vnet_sw_if_index_name, vnet_get_main(), p->tun_itf); + if (~0 != p->responder.sw_if_index) + vlib_cli_output(vm, " responder %U %U", + format_vnet_sw_if_index_name, vnet_get_main(), p->responder.sw_if_index, + format_ip4_address, &p->responder.ip4); + if (p->udp_encap) + vlib_cli_output(vm, " udp-encap"); + + if (p->ipsec_over_udp_port != IPSEC_UDP_PORT_NONE) + vlib_cli_output(vm, " ipsec-over-udp port %d", p->ipsec_over_udp_port); + + if (p->ike_ts.crypto_alg || p->ike_ts.integ_alg || p->ike_ts.dh_type || p->ike_ts.crypto_key_size) + vlib_cli_output(vm, " ike-crypto-alg %U %u ike-integ-alg %U ike-dh %U", + format_ikev2_transform_encr_type, p->ike_ts.crypto_alg, p->ike_ts.crypto_key_size, + format_ikev2_transform_integ_type, p->ike_ts.integ_alg, + format_ikev2_transform_dh_type, p->ike_ts.dh_type); + + if (p->esp_ts.crypto_alg || p->esp_ts.integ_alg || p->esp_ts.dh_type) + vlib_cli_output(vm, " esp-crypto-alg %U %u esp-integ-alg %U", + format_ikev2_transform_encr_type, p->esp_ts.crypto_alg, p->esp_ts.crypto_key_size, + format_ikev2_transform_integ_type, p->esp_ts.integ_alg); + + vlib_cli_output(vm, " lifetime %d jitter %d handover %d maxdata %d", + p->lifetime, p->lifetime_jitter, p->handover, p->lifetime_maxdata); })); /* *INDENT-ON* */ @@ -479,6 +560,45 @@ VLIB_CLI_COMMAND (show_ikev2_profile_command, static) = { }; /* *INDENT-ON* */ +static clib_error_t * +set_ikev2_liveness_period_fn (vlib_main_t * vm, + unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + unformat_input_t _line_input, *line_input = &_line_input; + clib_error_t *r = 0; + u32 period = 0, max_retries = 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, "%d %d", &period, &max_retries)) + { + r = ikev2_set_liveness_params (period, max_retries); + goto done; + } + else + break; + } + + r = clib_error_return (0, "parse error: '%U'", + format_unformat_error, line_input); + +done: + unformat_free (line_input); + return r; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (set_ikev2_liveness_command, static) = { + .path = "ikev2 set liveness", + .short_help = "ikev2 set liveness ", + .function = set_ikev2_liveness_period_fn, +}; +/* *INDENT-ON* */ + static clib_error_t * set_ikev2_local_key_command_fn (vlib_main_t * vm, unformat_input_t * input, @@ -595,7 +715,7 @@ ikev2_set_log_level_command_fn (vlib_main_t * vm, vlib_cli_command_t * cmd) { unformat_input_t _line_input, *line_input = &_line_input; - u8 log_level = IKEV2_LOG_NONE; + u32 log_level = IKEV2_LOG_NONE; clib_error_t *error = 0; /* Get a line of input. */