nat: elog rewrite for multi-worker support

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

diff --git a/src/plugins/nat/nat_reass.c b/src/plugins/nat/nat_reass.c
index d7f9d58..b518c0c 100755 (executable)
--- a/src/plugins/nat/nat_reass.c
+++ b/src/plugins/nat/nat_reass.c
@@ -232,7 +232,7 @@ nat_ip4_reass_create (ip4_address_t src, ip4_address_t dst, u16 frag_id,
 
   if (srm->ip4_reass_n >= srm->ip4_max_reass)
     {
-      nat_log_warn ("no free resassembly slot");
+      nat_elog_warn ("no free resassembly slot");
       goto unlock;
     }
 
@@ -263,7 +263,7 @@ nat_ip4_reass_create (ip4_address_t src, ip4_address_t dst, u16 frag_id,
   reass->flags = 0;
   reass->classify_next = NAT_REASS_IP4_CLASSIFY_NONE;
   if (clib_bihash_add_del_16_8 (&srm->ip4_reass_hash, &kv, 1))
-    nat_log_warn ("ip4_reass_hash add key failed");
+    nat_elog_warn ("ip4_reass_hash add key failed");
 
 unlock:
   clib_spinlock_unlock_if_init (&srm->ip4_reass_lock);
@@ -326,7 +326,7 @@ nat_ip4_reass_find_or_create (ip4_address_t src, ip4_address_t dst,
        {
          clib_dlist_addhead (srm->ip4_reass_lru_list_pool,
                              srm->ip4_reass_head_index, oldest_index);
-         nat_log_warn ("no free resassembly slot");
+         nat_elog_warn ("no free resassembly slot");
          reass = 0;
          goto unlock;
        }
@@ -535,7 +535,7 @@ nat_ip6_reass_find_or_create (ip6_address_t src, ip6_address_t dst,
        {
          clib_dlist_addhead (srm->ip6_reass_lru_list_pool,
                              srm->ip6_reass_head_index, oldest_index);
-         nat_log_warn ("no free resassembly slot");
+         nat_elog_warn ("no free resassembly slot");
          reass = 0;
          goto unlock;
        }
@@ -546,8 +546,9 @@ nat_ip6_reass_find_or_create (ip6_address_t src, ip6_address_t dst,
       kv.key[0] = k.as_u64[0];
       kv.key[1] = k.as_u64[1];
       kv.key[2] = k.as_u64[2];
-      kv.key[3] = k.as_u64[4];
-      kv.key[4] = k.as_u64[5];
+      kv.key[3] = k.as_u64[3];
+      kv.key[4] = k.as_u64[4];
+      kv.key[5] = k.as_u64[5];
       if (clib_bihash_add_del_48_8 (&srm->ip6_reass_hash, &kv, 0))
        {
          reass = 0;