ipsec: add ipv6 support for ipsec tunnel interface

[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..0f47c7b 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;
@@ -225,12 +226,14 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm,
   int rv, is_add = 0;
   u32 tmp, tmp2, stat_index;
   clib_error_t *error = NULL;
+  u32 is_outbound;
 
   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))
     return 0;
@@ -244,9 +247,9 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm,
       else if (unformat (line_input, "spd %u", &p.id))
        ;
       else if (unformat (line_input, "inbound"))
-       p.is_outbound = 0;
+       is_outbound = 0;
       else if (unformat (line_input, "outbound"))
-       p.is_outbound = 1;
+       is_outbound = 1;
       else if (unformat (line_input, "priority %d", &p.priority))
        ;
       else if (unformat (line_input, "protocol %u", &tmp))
@@ -288,12 +291,16 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm,
        {
          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
        {
@@ -324,6 +331,19 @@ ipsec_policy_add_del_command_fn (vlib_main_t * vm,
          goto done;
        }
     }
+
+  rv = ipsec_policy_mk_type (is_outbound, p.is_ipv6, p.policy, &p.type);
+
+  if (rv)
+    {
+      error = clib_error_return (0, "unsupported policy type for:",
+                                " outboud:%s %s action:%U",
+                                (is_outbound ? "yes" : "no"),
+                                (p.is_ipv6 ? "IPv4" : "IPv6"),
+                                format_ipsec_policy_action, p.policy);
+      goto done;
+    }
+
   rv = ipsec_add_del_policy (vm, &p, is_add, &stat_index);
 
   if (!rv)
@@ -594,6 +614,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 +636,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 +654,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 +683,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 +721,21 @@ create_ipsec_tunnel_command_fn (vlib_main_t * vm,
       goto done;
     }
 
+  if (ipv4_set && ipv6_set)
+    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+
+  a.is_ip6 = ipv6_set;
+
+  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)