misc: move to new pool_foreach macros

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

diff --git a/src/vnet/ipsec/ipsec_tun.c b/src/vnet/ipsec/ipsec_tun.c
index e2e1a3e..a35b619 100644 (file)
--- a/src/vnet/ipsec/ipsec_tun.c
+++ b/src/vnet/ipsec/ipsec_tun.c
@@ -18,11 +18,17 @@
 #include <vnet/ipsec/ipsec_tun.h>
 #include <vnet/ipsec/ipsec_itf.h>
 #include <vnet/ipsec/esp.h>
-#include <vnet/udp/udp.h>
+#include <vnet/udp/udp_local.h>
 #include <vnet/adj/adj_delegate.h>
 #include <vnet/adj/adj_midchain.h>
 #include <vnet/teib/teib.h>
 
+/* instantiate the bihash functions */
+#include <vppinfra/bihash_8_16.h>
+#include <vppinfra/bihash_template.c>
+#include <vppinfra/bihash_24_16.h>
+#include <vppinfra/bihash_template.c>
+
 #define IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS (64 * 1024)
 #define IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE 512 << 20
 
@@ -147,8 +153,9 @@ ipsec_tun_protect_get_adj_next (vnet_link_t linkt,
   sa = ipsec_sa_get (itp->itp_out_sa);
   im = &ipsec_main;
 
-  if (sa->crypto_alg == IPSEC_CRYPTO_ALG_NONE &&
-      sa->integ_alg == IPSEC_INTEG_ALG_NONE)
+  if ((sa->crypto_alg == IPSEC_CRYPTO_ALG_NONE &&
+       sa->integ_alg == IPSEC_INTEG_ALG_NONE) &&
+      !(itp->itp_flags & IPSEC_PROTECT_ITF))
     next = (is_ip4 ?
            im->esp4_no_crypto_tun_node_index :
            im->esp6_no_crypto_tun_node_index);
@@ -223,6 +230,8 @@ ipsec_tun_protect_rx_db_add (ipsec_main_t * im,
       ipsec_tun_lkup_result_t res = {
         .tun_index = itp - ipsec_tun_protect_pool,
         .sa_index = sai,
+        .flags = itp->itp_flags,
+        .sw_if_index = itp->itp_sw_if_index,
       };
 
       /*
@@ -234,18 +243,18 @@ ipsec_tun_protect_rx_db_add (ipsec_main_t * im,
           ipsec4_tunnel_kv_t key = {
             .value = res,
           };
-          clib_bihash_kv_8_8_t *bkey = (clib_bihash_kv_8_8_t*)&key;
+          clib_bihash_kv_8_16_t *bkey = (clib_bihash_kv_8_16_t*)&key;
 
           ipsec4_tunnel_mk_key(&key, &itp->itp_crypto.dst.ip4,
                                clib_host_to_net_u32 (sa->spi));
 
           if (!im->tun4_protect_by_key.nbuckets)
-              clib_bihash_init_8_8 (&im->tun4_protect_by_key,
+              clib_bihash_init_8_16 (&im->tun4_protect_by_key,
                        "IPSec IPv4 tunnels",
                        IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS,
                        IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE);
 
-          clib_bihash_add_del_8_8 (&im->tun4_protect_by_key, bkey, 1);
+          clib_bihash_add_del_8_16 (&im->tun4_protect_by_key, bkey, 1);
           ipsec_tun_register_nodes(AF_IP4);
         }
       else
@@ -257,14 +266,14 @@ ipsec_tun_protect_rx_db_add (ipsec_main_t * im,
             },
             .value = res,
           };
-          clib_bihash_kv_24_8_t *bkey = (clib_bihash_kv_24_8_t*)&key;
+          clib_bihash_kv_24_16_t *bkey = (clib_bihash_kv_24_16_t*)&key;
 
           if (!im->tun4_protect_by_key.nbuckets)
-            clib_bihash_init_24_8 (&im->tun6_protect_by_key,
+            clib_bihash_init_24_16 (&im->tun6_protect_by_key,
                                    "IPSec IPv6 tunnels",
                                    IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS,
                                    IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE);
-          clib_bihash_add_del_24_8 (&im->tun6_protect_by_key, bkey, 1);
+          clib_bihash_add_del_24_16 (&im->tun6_protect_by_key, bkey, 1);
           ipsec_tun_register_nodes(AF_IP6);
         }
   }))
@@ -354,14 +363,14 @@ ipsec_tun_protect_rx_db_remove (ipsec_main_t * im,
     if (ip46_address_is_ip4 (&itp->itp_crypto.dst))
       {
           ipsec4_tunnel_kv_t key;
-          clib_bihash_kv_8_8_t res, *bkey = (clib_bihash_kv_8_8_t*)&key;
+          clib_bihash_kv_8_16_t res, *bkey = (clib_bihash_kv_8_16_t*)&key;
 
           ipsec4_tunnel_mk_key(&key, &itp->itp_crypto.dst.ip4,
                                clib_host_to_net_u32 (sa->spi));
 
-          if (!clib_bihash_search_8_8 (&im->tun4_protect_by_key, bkey, &res))
+          if (!clib_bihash_search_8_16 (&im->tun4_protect_by_key, bkey, &res))
             {
-              clib_bihash_add_del_8_8 (&im->tun4_protect_by_key, bkey, 0);
+              clib_bihash_add_del_8_16 (&im->tun4_protect_by_key, bkey, 0);
               ipsec_tun_unregister_nodes(AF_IP4);
             }
       }
@@ -373,11 +382,11 @@ ipsec_tun_protect_rx_db_remove (ipsec_main_t * im,
             .spi = clib_host_to_net_u32 (sa->spi),
           },
         };
-        clib_bihash_kv_24_8_t res, *bkey = (clib_bihash_kv_24_8_t*)&key;
+        clib_bihash_kv_24_16_t res, *bkey = (clib_bihash_kv_24_16_t*)&key;
 
-        if (!clib_bihash_search_24_8 (&im->tun6_protect_by_key, bkey, &res))
+        if (!clib_bihash_search_24_16 (&im->tun6_protect_by_key, bkey, &res))
           {
-            clib_bihash_add_del_24_8 (&im->tun6_protect_by_key, bkey, 0);
+            clib_bihash_add_del_24_16 (&im->tun6_protect_by_key, bkey, 0);
             ipsec_tun_unregister_nodes(AF_IP6);
           }
       }
@@ -723,8 +732,9 @@ ipsec_tun_protect_update (u32 sw_if_index,
 
       if (ip46_address_is_zero (&itp->itp_tun.src))
        {
-         /* must be one of thos pesky ipsec interfaces that has no encap.
-          * the encap then MUST comefrom the tunnel mode SA.
+         /*
+          * must be one of those pesky ipsec interfaces that has no encap.
+          * the encap then MUST come from the tunnel mode SA.
           */
          ipsec_sa_t *sa;
 
@@ -828,10 +838,10 @@ ipsec_tun_protect_walk (ipsec_tun_protect_walk_cb_t fn, void *ctx)
   index_t itpi;
 
   /* *INDENT-OFF* */
-  pool_foreach_index(itpi, ipsec_tun_protect_pool,
-  ({
+  pool_foreach_index (itpi, ipsec_tun_protect_pool)
+   {
     fn (itpi, ctx);
-  }));
+  }
   /* *INDENT-ON* */
 }
 
@@ -970,11 +980,11 @@ ipsec_tun_table_init (ip_address_family_t af, uword table_size, u32 n_buckets)
   im = &ipsec_main;
 
   if (AF_IP4 == af)
-    clib_bihash_init_8_8 (&im->tun4_protect_by_key,
-                         "IPSec IPv4 tunnels", n_buckets, table_size);
+    clib_bihash_init_8_16 (&im->tun4_protect_by_key,
+                          "IPSec IPv4 tunnels", n_buckets, table_size);
   else
-    clib_bihash_init_24_8 (&im->tun6_protect_by_key,
-                          "IPSec IPv6 tunnels", n_buckets, table_size);
+    clib_bihash_init_24_16 (&im->tun6_protect_by_key,
+                           "IPSec IPv6 tunnels", n_buckets, table_size);
 }
 
 clib_error_t *
@@ -983,14 +993,14 @@ ipsec_tunnel_protect_init (vlib_main_t * vm)
   ipsec_main_t *im;
 
   im = &ipsec_main;
-  clib_bihash_init_24_8 (&im->tun6_protect_by_key,
-                        "IPSec IPv6 tunnels",
+  clib_bihash_init_24_16 (&im->tun6_protect_by_key,
+                         "IPSec IPv6 tunnels",
+                         IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS,
+                         IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE);
+  clib_bihash_init_8_16 (&im->tun4_protect_by_key,
+                        "IPSec IPv4 tunnels",
                         IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS,
                         IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE);
-  clib_bihash_init_8_8 (&im->tun4_protect_by_key,
-                       "IPSec IPv4 tunnels",
-                       IPSEC_TUN_DEFAULT_HASH_NUM_BUCKETS,
-                       IPSEC_TUN_DEFAULT_HASH_MEMORY_SIZE);
 
   /* set up feature nodes to drop outbound packets with no crypto alg set */
   im->esp4_no_crypto_tun_node_index =