nat: use SVR

[vpp.git] / src / plugins / nat / nat66.c

diff --git a/src/plugins/nat/nat66.c b/src/plugins/nat/nat66.c
index 7296741..3ac773c 100644 (file)
--- a/src/plugins/nat/nat66.c
+++ b/src/plugins/nat/nat66.c
@@ -19,6 +19,7 @@
 
 #include <nat/nat66.h>
 #include <vnet/fib/fib_table.h>
+#include <vnet/ip/reass/ip6_sv_reass.h>
 
 nat66_main_t nat66_main;
 
@@ -29,23 +30,32 @@ VNET_FEATURE_INIT (nat66_in2out, static) = {
   .arc_name = "ip6-unicast",
   .node_name = "nat66-in2out",
   .runs_before = VNET_FEATURES ("ip6-lookup"),
+  .runs_after = VNET_FEATURES ("ip6-sv-reassembly-feature"),
 };
 VNET_FEATURE_INIT (nat66_out2in, static) = {
   .arc_name = "ip6-unicast",
   .node_name = "nat66-out2in",
   .runs_before = VNET_FEATURES ("ip6-lookup"),
+  .runs_after = VNET_FEATURES ("ip6-sv-reassembly-feature"),
 };
 
 /* *INDENT-ON* */
 
 
 void
-nat66_init (void)
+nat66_init (vlib_main_t * vm)
 {
   nat66_main_t *nm = &nat66_main;
+  vlib_node_t *node;
   u32 static_mapping_buckets = 1024;
   uword static_mapping_memory_size = 64 << 20;
 
+  node = vlib_get_node_by_name (vm, (u8 *) "nat66-in2out");
+  nm->in2out_node_index = node->index;
+
+  node = vlib_get_node_by_name (vm, (u8 *) "nat66-out2in");
+  nm->out2in_node_index = node->index;
+
   clib_bihash_init_24_8 (&nm->sm_l, "nat66-static-map-by-local",
                         static_mapping_buckets, static_mapping_memory_size);
   clib_bihash_init_24_8 (&nm->sm_e, "nat66-static-map-by-external",
@@ -92,6 +102,9 @@ nat66_interface_add_del (u32 sw_if_index, u8 is_inside, u8 is_add)
     }
 
   feature_name = is_inside ? "nat66-in2out" : "nat66-out2in";
+  int rv = ip6_sv_reass_enable_disable_with_refcnt (sw_if_index, is_add);
+  if (rv)
+    return rv;
   return vnet_feature_enable_disable ("ip6-unicast", feature_name,
                                      sw_if_index, is_add, 0, 0);
 }
@@ -163,9 +176,9 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
        return VNET_API_ERROR_VALUE_EXIST;
 
       fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, vrf_id,
-                                                    FIB_SOURCE_PLUGIN_HI);
+                                                    nat_fib_src_hi);
       pool_get (nm->sm, sm);
-      memset (sm, 0, sizeof (*sm));
+      clib_memset (sm, 0, sizeof (*sm));
       sm->l_addr.as_u64[0] = l_addr->as_u64[0];
       sm->l_addr.as_u64[1] = l_addr->as_u64[1];
       sm->e_addr.as_u64[0] = e_addr->as_u64[0];
@@ -178,7 +191,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       kv.key[2] = sm_key.as_u64[2];
       kv.value = sm - nm->sm;
       if (clib_bihash_add_del_24_8 (&nm->sm_l, &kv, 1))
-       nat_log_warn ("nat66-static-map-by-local add key failed");
+       nat_elog_warn ("nat66-static-map-by-local add key failed");
       sm_key.addr.as_u64[0] = e_addr->as_u64[0];
       sm_key.addr.as_u64[1] = e_addr->as_u64[1];
       sm_key.fib_index = 0;
@@ -186,7 +199,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       kv.key[1] = sm_key.as_u64[1];
       kv.key[2] = sm_key.as_u64[2];
       if (clib_bihash_add_del_24_8 (&nm->sm_e, &kv, 1))
-       nat_log_warn ("nat66-static-map-by-external add key failed");
+       nat_elog_warn ("nat66-static-map-by-external add key failed");
 
       vlib_validate_combined_counter (&nm->session_counters, kv.value);
       vlib_zero_combined_counter (&nm->session_counters, kv.value);
@@ -198,7 +211,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
 
       kv.value = sm - nm->sm;
       if (clib_bihash_add_del_24_8 (&nm->sm_l, &kv, 0))
-       nat_log_warn ("nat66-static-map-by-local delete key failed");
+       nat_elog_warn ("nat66-static-map-by-local delete key failed");
       sm_key.addr.as_u64[0] = e_addr->as_u64[0];
       sm_key.addr.as_u64[1] = e_addr->as_u64[1];
       sm_key.fib_index = 0;
@@ -206,9 +219,8 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       kv.key[1] = sm_key.as_u64[1];
       kv.key[2] = sm_key.as_u64[2];
       if (clib_bihash_add_del_24_8 (&nm->sm_e, &kv, 0))
-       nat_log_warn ("nat66-static-map-by-external delete key failed");
-      fib_table_unlock (sm->fib_index, FIB_PROTOCOL_IP6,
-                       FIB_SOURCE_PLUGIN_HI);
+       nat_elog_warn ("nat66-static-map-by-external delete key failed");
+      fib_table_unlock (sm->fib_index, FIB_PROTOCOL_IP6, nat_fib_src_hi);
       pool_put (nm->sm, sm);
     }