ipsec: cli bug 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 f66bf6d..648455b 100644 (file)
--- a/src/vnet/ipsec/ipsec_cli.c
+++ b/src/vnet/ipsec/ipsec_cli.c
@@ -82,7 +82,8 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm,
   ipsec_protocol_t proto;
   ipsec_sa_flags_t flags;
   clib_error_t *error;
-  ipsec_key_t ck, ik;
+  ipsec_key_t ck = { 0 };
+  ipsec_key_t ik = { 0 };
   int is_add, rv;
   u32 id, spi;
 
@@ -118,14 +119,14 @@ ipsec_sa_add_del_command_fn (vlib_main_t * vm,
                         unformat_ipsec_integ_alg, &integ_alg))
        ;
       else if (unformat (line_input, "tunnel-src %U",
-                        unformat_ip46_address, &tun_src))
+                        unformat_ip46_address, &tun_src, IP46_TYPE_ANY))
        {
          flags |= IPSEC_SA_FLAG_IS_TUNNEL;
          if (!ip46_address_is_ip4 (&tun_src))
            flags |= IPSEC_SA_FLAG_IS_TUNNEL_V6;
        }
       else if (unformat (line_input, "tunnel-dst %U",
-                        unformat_ip46_address, &tun_dst))
+                        unformat_ip46_address, &tun_dst, IP46_TYPE_ANY))
        ;
       else if (unformat (line_input, "udp-encap"))
        flags |= IPSEC_SA_FLAG_UDP_ENCAP;
@@ -594,6 +595,7 @@ clear_ipsec_counters_command_fn (vlib_main_t * vm,
                                 vlib_cli_command_t * cmd)
 {
   vlib_clear_combined_counters (&ipsec_spd_policy_counters);
+  vlib_clear_combined_counters (&ipsec_sa_counters);
 
   return (NULL);
 }
@@ -615,7 +617,13 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
   ipsec_add_del_tunnel_args_t a;
   int rv;
   u32 num_m_args = 0;
+  u8 ipv4_set = 0;
+  u8 ipv6_set = 0;
   clib_error_t *error = NULL;
+  ipsec_key_t rck = { 0 };
+  ipsec_key_t lck = { 0 };
+  ipsec_key_t lik = { 0 };
+  ipsec_key_t rik = { 0 };
 
   clib_memset (&a, 0, sizeof (a));
   a.is_add = 1;
@@ -627,12 +635,21 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat
-         (line_input, "local-ip %U", unformat_ip4_address, &a.local_ip))
-       num_m_args++;
+         (line_input, "local-ip %U", unformat_ip46_address, &a.local_ip,
+          IP46_TYPE_ANY))
+       {
+         ip46_address_is_ip4 (&a.local_ip) ? (ipv4_set = 1) : (ipv6_set = 1);
+         num_m_args++;
+       }
       else
        if (unformat
-           (line_input, "remote-ip %U", unformat_ip4_address, &a.remote_ip))
-       num_m_args++;
+           (line_input, "remote-ip %U", unformat_ip46_address, &a.remote_ip,
+            IP46_TYPE_ANY))
+       {
+         ip46_address_is_ip4 (&a.remote_ip) ? (ipv4_set = 1) : (ipv6_set =
+                                                                1);
+         num_m_args++;
+       }
       else if (unformat (line_input, "local-spi %u", &a.local_spi))
        num_m_args++;
       else if (unformat (line_input, "remote-spi %u", &a.remote_spi))
@@ -647,6 +664,28 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
        a.anti_replay = 1;
       else if (unformat (line_input, "tx-table %u", &a.tx_table_id))
        ;
+      else
+       if (unformat
+           (line_input, "local-crypto-key %U", unformat_ipsec_key, &lck))
+       ;
+      else
+       if (unformat
+           (line_input, "remote-crypto-key %U", unformat_ipsec_key, &rck))
+       ;
+      else if (unformat (line_input, "crypto-alg %U",
+                        unformat_ipsec_crypto_alg, &a.crypto_alg))
+       ;
+      else
+       if (unformat
+           (line_input, "local-integ-key %U", unformat_ipsec_key, &lik))
+       ;
+      else
+       if (unformat
+           (line_input, "rmote-integ-key %U", unformat_ipsec_key, &rik))
+       ;
+      else if (unformat (line_input, "integ-alg %U",
+                        unformat_ipsec_integ_alg, &a.integ_alg))
+       ;
       else if (unformat (line_input, "del"))
        a.is_add = 0;
       else
@@ -663,6 +702,22 @@ 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");
+
+  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);
+  a.remote_crypto_key_len = rck.len;
+
+  clib_memcpy (a.local_integ_key, lik.data, lik.len);
+  a.local_integ_key_len = lck.len;
+  clib_memcpy (a.remote_integ_key, rik.data, rik.len);
+  a.remote_integ_key_len = rck.len;
+
   rv = ipsec_add_del_tunnel_if (&a);
 
   switch (rv)