Type: fix
Change-Id: Ibdd83fa336427ec0c66224ecebb1b6bd36d1d1ba
Signed-off-by: Benoît Ganne <bganne@cisco.com>
+static uword
+unformat_ikev2_token (unformat_input_t * input, va_list * va)
+{
+ u8 **string_return = va_arg (*va, u8 **);
+ const char *token_chars = "a-zA-Z0-9_";
+ if (*string_return)
+ {
+ /* if string_return was already allocated (eg. because of a previous
+ * partial match with a successful unformat_token()), we must free it
+ * before reusing the pointer, otherwise we'll be leaking memory
+ */
+ vec_free (*string_return);
+ *string_return = 0;
+ }
+ return unformat_user (input, unformat_token, token_chars, string_return);
+}
+
static clib_error_t *
ikev2_profile_add_del_command_fn (vlib_main_t * vm,
unformat_input_t * input,
static clib_error_t *
ikev2_profile_add_del_command_fn (vlib_main_t * vm,
unformat_input_t * input,
ikev2_transform_integ_type_t integ_alg;
ikev2_transform_dh_type_t dh_type;
ikev2_transform_integ_type_t integ_alg;
ikev2_transform_dh_type_t dh_type;
- const char *valid_chars = "a-zA-Z0-9_";
-
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_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, "add %U", unformat_token, valid_chars, &name))
+ if (unformat (line_input, "add %U", unformat_ikev2_token, &name))
{
r = ikev2_add_del_profile (vm, name, 1);
goto done;
}
{
r = ikev2_add_del_profile (vm, name, 1);
goto done;
}
- else
- if (unformat
- (line_input, "del %U", unformat_token, valid_chars, &name))
+ else if (unformat (line_input, "del %U", unformat_ikev2_token, &name))
{
r = ikev2_add_del_profile (vm, name, 0);
goto done;
}
else if (unformat (line_input, "set %U auth shared-key-mic string %v",
{
r = ikev2_add_del_profile (vm, name, 0);
goto done;
}
else if (unformat (line_input, "set %U auth shared-key-mic string %v",
- unformat_token, valid_chars, &name, &data))
+ unformat_ikev2_token, &name, &data))
{
r =
ikev2_set_profile_auth (vm, name,
{
r =
ikev2_set_profile_auth (vm, name,
goto done;
}
else if (unformat (line_input, "set %U auth shared-key-mic hex %U",
goto done;
}
else if (unformat (line_input, "set %U auth shared-key-mic hex %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_hex_string, &data))
{
r =
unformat_hex_string, &data))
{
r =
goto done;
}
else if (unformat (line_input, "set %U auth rsa-sig cert-file %v",
goto done;
}
else if (unformat (line_input, "set %U auth rsa-sig cert-file %v",
- unformat_token, valid_chars, &name, &data))
+ unformat_ikev2_token, &name, &data))
{
r =
ikev2_set_profile_auth (vm, name, IKEV2_AUTH_METHOD_RSA_SIG, data,
{
r =
ikev2_set_profile_auth (vm, name, IKEV2_AUTH_METHOD_RSA_SIG, data,
goto done;
}
else if (unformat (line_input, "set %U id local %U %U",
goto done;
}
else if (unformat (line_input, "set %U id local %U %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_id_type, &id_type,
unformat_ip4_address, &ip4))
{
unformat_ikev2_id_type, &id_type,
unformat_ip4_address, &ip4))
{
goto done;
}
else if (unformat (line_input, "set %U id local %U 0x%U",
goto done;
}
else if (unformat (line_input, "set %U id local %U 0x%U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_id_type, &id_type,
unformat_hex_string, &data))
{
unformat_ikev2_id_type, &id_type,
unformat_hex_string, &data))
{
goto done;
}
else if (unformat (line_input, "set %U id local %U %v",
goto done;
}
else if (unformat (line_input, "set %U id local %U %v",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_id_type, &id_type, &data))
{
r =
unformat_ikev2_id_type, &id_type, &data))
{
r =
goto done;
}
else if (unformat (line_input, "set %U id remote %U %U",
goto done;
}
else if (unformat (line_input, "set %U id remote %U %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_id_type, &id_type,
unformat_ip4_address, &ip4))
{
unformat_ikev2_id_type, &id_type,
unformat_ip4_address, &ip4))
{
goto done;
}
else if (unformat (line_input, "set %U id remote %U 0x%U",
goto done;
}
else if (unformat (line_input, "set %U id remote %U 0x%U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_id_type, &id_type,
unformat_hex_string, &data))
{
unformat_ikev2_id_type, &id_type,
unformat_hex_string, &data))
{
goto done;
}
else if (unformat (line_input, "set %U id remote %U %v",
goto done;
}
else if (unformat (line_input, "set %U id remote %U %v",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_id_type, &id_type, &data))
{
r = ikev2_set_profile_id (vm, name, (u8) id_type, data, /*remote */
unformat_ikev2_id_type, &id_type, &data))
{
r = ikev2_set_profile_id (vm, name, (u8) id_type, data, /*remote */
}
else if (unformat (line_input, "set %U traffic-selector local "
"ip-range %U - %U port-range %u - %u protocol %u",
}
else if (unformat (line_input, "set %U traffic-selector local "
"ip-range %U - %U port-range %u - %u protocol %u",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ip4_address, &ip4,
unformat_ip4_address, &end_addr,
&tmp1, &tmp2, &tmp3))
unformat_ip4_address, &ip4,
unformat_ip4_address, &end_addr,
&tmp1, &tmp2, &tmp3))
}
else if (unformat (line_input, "set %U traffic-selector remote "
"ip-range %U - %U port-range %u - %u protocol %u",
}
else if (unformat (line_input, "set %U traffic-selector remote "
"ip-range %U - %U port-range %u - %u protocol %u",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ip4_address, &ip4,
unformat_ip4_address, &end_addr,
&tmp1, &tmp2, &tmp3))
unformat_ip4_address, &ip4,
unformat_ip4_address, &end_addr,
&tmp1, &tmp2, &tmp3))
goto done;
}
else if (unformat (line_input, "set %U responder %U %U",
goto done;
}
else if (unformat (line_input, "set %U responder %U %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_vnet_sw_interface, vnm,
&responder_sw_if_index, unformat_ip4_address,
&responder_ip4))
unformat_vnet_sw_interface, vnm,
&responder_sw_if_index, unformat_ip4_address,
&responder_ip4))
goto done;
}
else if (unformat (line_input, "set %U tunnel %U",
goto done;
}
else if (unformat (line_input, "set %U tunnel %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_vnet_sw_interface, vnm, &tun_sw_if_index))
{
r = ikev2_set_profile_tunnel_interface (vm, name, tun_sw_if_index);
unformat_vnet_sw_interface, vnm, &tun_sw_if_index))
{
r = ikev2_set_profile_tunnel_interface (vm, name, tun_sw_if_index);
if (unformat
(line_input,
"set %U ike-crypto-alg %U %u ike-integ-alg %U ike-dh %U",
if (unformat
(line_input,
"set %U ike-crypto-alg %U %u ike-integ-alg %U ike-dh %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
unformat_ikev2_transform_integ_type, &integ_alg,
unformat_ikev2_transform_dh_type, &dh_type))
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
unformat_ikev2_transform_integ_type, &integ_alg,
unformat_ikev2_transform_dh_type, &dh_type))
if (unformat
(line_input,
"set %U ike-crypto-alg %U %u ike-dh %U",
if (unformat
(line_input,
"set %U ike-crypto-alg %U %u ike-dh %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
unformat_ikev2_transform_dh_type, &dh_type))
{
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
unformat_ikev2_transform_dh_type, &dh_type))
{
if (unformat
(line_input,
"set %U esp-crypto-alg %U %u esp-integ-alg %U",
if (unformat
(line_input,
"set %U esp-crypto-alg %U %u esp-integ-alg %U",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
unformat_ikev2_transform_integ_type, &integ_alg))
{
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1,
unformat_ikev2_transform_integ_type, &integ_alg))
{
else if (unformat
(line_input,
"set %U esp-crypto-alg %U %u",
else if (unformat
(line_input,
"set %U esp-crypto-alg %U %u",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1))
{
r =
unformat_ikev2_transform_encr_type, &crypto_alg, &tmp1))
{
r =
goto done;
}
else if (unformat (line_input, "set %U sa-lifetime %lu %u %u %lu",
goto done;
}
else if (unformat (line_input, "set %U sa-lifetime %lu %u %u %lu",
- unformat_token, valid_chars, &name,
+ unformat_ikev2_token, &name,
&tmp4, &tmp1, &tmp2, &tmp5))
{
r =
&tmp4, &tmp1, &tmp2, &tmp5))
{
r =
goto done;
}
else if (unformat (line_input, "set %U udp-encap",
goto done;
}
else if (unformat (line_input, "set %U udp-encap",
- unformat_token, valid_chars, &name))
+ unformat_ikev2_token, &name))
{
r = ikev2_set_profile_udp_encap (vm, name);
goto done;
}
else if (unformat (line_input, "set %U ipsec-over-udp port %u",
{
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))
+ unformat_ikev2_token, &name, &tmp1))
{
int rv = ikev2_set_profile_ipsec_udp_port (vm, name, tmp1, 1);
if (rv)
{
int rv = ikev2_set_profile_ipsec_udp_port (vm, name, tmp1, 1);
if (rv)
- const char *valid_chars = "a-zA-Z0-9_";
-
if (!unformat_user (input, unformat_line_input, line_input))
return 0;
while (unformat_check_input (line_input) != UNFORMAT_END_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, "sa-init %U", unformat_token, valid_chars, &name))
+ if (unformat (line_input, "sa-init %U", unformat_ikev2_token, &name))
{
r = ikev2_initiate_sa_init (vm, name);
goto done;
{
r = ikev2_initiate_sa_init (vm, name);
goto done;