IPSEC: some CLI fixes

[vpp.git] / src / vnet / ipsec / ipsec_cli.c

diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c
index 0960608..36ea614 100644 (file)
--- 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, 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))
@@ -658,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;
@@ -817,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))