X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat66.c;h=2caefab6480ec476b50a80496d54631cf048510c;hb=2f71a888993dc9ee958f174d2e456221d7005f60;hp=729674171d7f1f914faca81f42b804cce2dd25e6;hpb=2d24cd027275905f308f75bf45d0f9d163f2235b;p=vpp.git

diff --git a/src/plugins/nat/nat66.c b/src/plugins/nat/nat66.c
index 729674171d7..2caefab6480 100644
--- a/src/plugins/nat/nat66.c
+++ b/src/plugins/nat/nat66.c
@@ -40,12 +40,19 @@ VNET_FEATURE_INIT (nat66_out2in, static) = {
 
 
 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",
@@ -165,7 +172,7 @@ nat66_static_mapping_add_del (ip6_address_t * l_addr, ip6_address_t * e_addr,
       fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP6, vrf_id,
 						     FIB_SOURCE_PLUGIN_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 +185,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 +193,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 +205,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,7 +213,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, 0))
-	nat_log_warn ("nat66-static-map-by-external delete key failed");
+	nat_elog_warn ("nat66-static-map-by-external delete key failed");
       fib_table_unlock (sm->fib_index, FIB_PROTOCOL_IP6,
 			FIB_SOURCE_PLUGIN_HI);
       pool_put (nm->sm, sm);