#include <vnet/fib/fib.h>
#include <vnet/ipsec/ipsec.h>
+#include <vnet/ipsec/ipsec_tun.h>
static clib_error_t *
set_interface_spd_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;
is_add = 0;
else if (unformat (line_input, "spi %u", &spi))
;
+ else if (unformat (line_input, "salt 0x%x", &salt))
+ ;
else if (unformat (line_input, "esp"))
proto = IPSEC_PROTOCOL_ESP;
else if (unformat (line_input, "ah"))
}
if (is_add)
- rv = ipsec_sa_add (id, spi, proto, crypto_alg,
- &ck, integ_alg, &ik, flags,
- 0, &tun_src, &tun_dst, NULL);
+ 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);
else
- rv = ipsec_sa_del (id);
+ rv = ipsec_sa_unlock_id (id);
if (rv)
- clib_error_return (0, "failed");
+ error = clib_error_return (0, "failed");
done:
unformat_free (line_input);
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))
{
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
{
}
}
- /* 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)
};
/* *INDENT-ON* */
+static void
+ipsec_sa_show_all (vlib_main_t * vm, ipsec_main_t * im)
+{
+ u32 sai;
+
+ /* *INDENT-OFF* */
+ pool_foreach_index (sai, im->sad, ({
+ vlib_cli_output(vm, "%U", format_ipsec_sa, sai, IPSEC_FORMAT_BRIEF);
+ }));
+ /* *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;
+ ipsec_spd_t *spd;
+
+ vlib_cli_output (vm, "SPD Bindings:");
+
+ /* *INDENT-OFF* */
+ hash_foreach(sw_if_index, spd_id, im->spd_index_by_sw_if_index, ({
+ spd = pool_elt_at_index (im->spds, spd_id);
+ vlib_cli_output (vm, " %d -> %U", spd->id,
+ format_vnet_sw_if_index_name, im->vnet_main,
+ sw_if_index);
+ }));
+ /* *INDENT-ON* */
+}
+
+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_index (ti, im->tunnel_interfaces, ({
+ vlib_cli_output(vm, " %U", format_ipsec_tunnel, ti);
+ }));
+ /* *INDENT-ON* */
+}
+
static clib_error_t *
-set_ipsec_sa_key_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+show_ipsec_command_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 *error = NULL;
- ipsec_key_t ck, ik;
- u32 id;
+ ipsec_main_t *im = &ipsec_main;
- if (!unformat_user (input, unformat_line_input, line_input))
- return 0;
+ 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);
- while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+ return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (show_ipsec_command, static) = {
+ .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 (line_input, "%u", &id))
+ if (unformat (input, "%u", &sai))
;
else
- if (unformat (line_input, "crypto-key %U", unformat_ipsec_key, &ck))
- ;
- else if (unformat (line_input, "integ-key %U", unformat_ipsec_key, &ik))
+ 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;
+}
+
+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)
+ {
+ if (unformat (input, "%u", &sai))
;
else
- {
- error = clib_error_return (0, "parse error: '%U'",
- format_unformat_error, line_input);
- goto done;
- }
+ break;
}
- ipsec_set_sa_key (id, &ck, &ik);
-
-done:
- unformat_free (line_input);
+ if (~0 == sai)
+ {
+ /* *INDENT-OFF* */
+ pool_foreach_index (sai, im->sad, ({
+ ipsec_sa_clear(sai);
+ }));
+ /* *INDENT-ON* */
+ }
+ else
+ {
+ if (pool_is_free_index (im->sad, sai))
+ return clib_error_return (0, "unknown SA index: %d", sai);
+ else
+ ipsec_sa_clear (sai);
+ }
- return error;
+ return 0;
}
/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_ipsec_sa_key_command, static) = {
- .path = "set ipsec sa",
- .short_help =
- "set ipsec sa <id> crypto-key <key> integ-key <key>",
- .function = set_ipsec_sa_key_command_fn,
+VLIB_CLI_COMMAND (show_ipsec_sa_command, static) = {
+ .path = "show ipsec sa",
+ .short_help = "show ipsec sa [index]",
+ .function = show_ipsec_sa_command_fn,
+};
+
+VLIB_CLI_COMMAND (clear_ipsec_sa_command, static) = {
+ .path = "clear ipsec sa",
+ .short_help = "clear ipsec sa [index]",
+ .function = clear_ipsec_sa_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)
+show_ipsec_spd_command_fn (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
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;
+ u8 show_bindings = 0;
+ u32 spdi = ~0;
- /* *INDENT-OFF* */
- pool_foreach_index (sai, im->sad, ({
- vlib_cli_output(vm, "%U", format_ipsec_sa, sai);
- }));
- pool_foreach_index (i, im->spds, ({
- vlib_cli_output(vm, "%U", format_ipsec_spd, i);
- }));
+ while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+ {
+ if (unformat (input, "%u", &spdi))
+ ;
+ else if (unformat (input, "bindings"))
+ show_bindings = 1;
+ else
+ break;
+ }
- vlib_cli_output (vm, "SPD Bindings:");
+ 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);
- 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* */
+ return 0;
+}
- 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);
+/* *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* */
- vlib_cli_output(vm, " %s", hi->name);
+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;
- vlib_cli_output(vm, " out-bound sa");
- vlib_cli_output(vm, " %U", format_ipsec_sa, t->output_sa_index);
+ 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);
- 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]",
- .function = show_ipsec_command_fn,
+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* */
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;
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"))
;
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))
/* *INDENT-ON* */
static clib_error_t *
-set_interface_key_command_fn (vlib_main_t * vm,
- unformat_input_t * input,
- vlib_cli_command_t * cmd)
+ipsec_tun_protect_cmd (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
{
unformat_input_t _line_input, *line_input = &_line_input;
- ipsec_main_t *im = &ipsec_main;
- ipsec_if_set_key_type_t type = IPSEC_IF_SET_KEY_TYPE_NONE;
- u32 hw_if_index = (u32) ~ 0;
- u32 alg;
- u8 *key = 0;
- clib_error_t *error = NULL;
+ u32 sw_if_index, is_del, sa_in, sa_out, *sa_ins = NULL;
+ vnet_main_t *vnm;
+
+ is_del = 0;
+ sw_if_index = ~0;
+ vnm = vnet_get_main ();
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, "%U",
- unformat_vnet_hw_interface, im->vnet_main, &hw_if_index))
+ if (unformat (line_input, "del"))
+ is_del = 1;
+ else if (unformat (line_input, "add"))
+ is_del = 0;
+ else if (unformat (line_input, "sa-in %d", &sa_in))
+ vec_add1 (sa_ins, sa_in);
+ else if (unformat (line_input, "sa-out %d", &sa_out))
;
- else
- if (unformat
- (line_input, "local crypto %U", unformat_ipsec_crypto_alg, &alg))
- type = IPSEC_IF_SET_KEY_TYPE_LOCAL_CRYPTO;
- else
- if (unformat
- (line_input, "remote crypto %U", unformat_ipsec_crypto_alg, &alg))
- type = IPSEC_IF_SET_KEY_TYPE_REMOTE_CRYPTO;
- else
- if (unformat
- (line_input, "local integ %U", unformat_ipsec_integ_alg, &alg))
- type = IPSEC_IF_SET_KEY_TYPE_LOCAL_INTEG;
- else
- if (unformat
- (line_input, "remote integ %U", unformat_ipsec_integ_alg, &alg))
- type = IPSEC_IF_SET_KEY_TYPE_REMOTE_INTEG;
- else if (unformat (line_input, "%U", unformat_hex_string, &key))
+ else if (unformat (line_input, "%U",
+ unformat_vnet_sw_interface, vnm, &sw_if_index))
;
else
- {
- error = clib_error_return (0, "parse error: '%U'",
- format_unformat_error, line_input);
- goto done;
- }
+ return (clib_error_return (0, "unknown input '%U'",
+ format_unformat_error, line_input));
}
- if (type == IPSEC_IF_SET_KEY_TYPE_NONE)
- {
- error = clib_error_return (0, "unknown key type");
- goto done;
- }
+ if (!is_del)
+ ipsec_tun_protect_update (sw_if_index, sa_out, sa_ins);
- if (alg > 0 && vec_len (key) == 0)
- {
- error = clib_error_return (0, "key is not specified");
- goto done;
- }
+ unformat_free (line_input);
+ return NULL;
+}
- if (hw_if_index == (u32) ~ 0)
- {
- error = clib_error_return (0, "interface not specified");
- goto done;
- }
+/**
+ * Protect tunnel with IPSEC
+ */
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (ipsec_tun_protect_cmd_node, static) =
+{
+ .path = "ipsec tunnel protect",
+ .function = ipsec_tun_protect_cmd,
+ .short_help = "ipsec tunnel protect <interface> input-sa <SA> output-sa <SA>",
+ // this is not MP safe
+};
+/* *INDENT-ON* */
- ipsec_set_interface_key (im->vnet_main, hw_if_index, type, alg, key);
+static walk_rc_t
+ipsec_tun_protect_show_one (index_t itpi, void *ctx)
+{
+ vlib_cli_output (ctx, "%U", format_ipsec_tun_protect, itpi);
-done:
- vec_free (key);
- unformat_free (line_input);
+ return (WALK_CONTINUE);
+}
- return error;
+static clib_error_t *
+ipsec_tun_protect_show (vlib_main_t * vm,
+ unformat_input_t * input, vlib_cli_command_t * cmd)
+{
+ ipsec_tun_protect_walk (ipsec_tun_protect_show_one, vm);
+
+ return NULL;
}
+/**
+ * show IPSEC tunnel protection
+ */
/* *INDENT-OFF* */
-VLIB_CLI_COMMAND (set_interface_key_command, static) = {
- .path = "set interface ipsec key",
- .short_help =
- "set interface ipsec key <int> <local|remote> <crypto|integ> <key type> <key>",
- .function = set_interface_key_command_fn,
+VLIB_CLI_COMMAND (ipsec_tun_protect_show_node, static) =
+{
+ .path = "show ipsec protect",
+ .function = ipsec_tun_protect_show,
+ .short_help = "show ipsec protect",
};
/* *INDENT-ON* */