X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fnat%2Fnat_reass.c;h=d7f9d58fc86c81d74a9190ab8b2f273bd44d7c0e;hb=1d1985de91833a5483a6b7ee96ef4090d530a7a6;hp=1a5aeebdf7c6cf40f68d4dc87a6a8ff7bdc305c0;hpb=fe0aa7648703f63159be8362836b39d4727fbb0c;p=vpp.git

diff --git a/src/plugins/nat/nat_reass.c b/src/plugins/nat/nat_reass.c
index 1a5aeebdf7c..d7f9d58fc86 100755
--- a/src/plugins/nat/nat_reass.c
+++ b/src/plugins/nat/nat_reass.c
@@ -216,6 +216,60 @@ nat_ip4_reass_find (ip4_address_t src, ip4_address_t dst, u16 frag_id,
   return reass;
 }
 
+nat_reass_ip4_t *
+nat_ip4_reass_create (ip4_address_t src, ip4_address_t dst, u16 frag_id,
+		      u8 proto)
+{
+  nat_reass_main_t *srm = &nat_reass_main;
+  nat_reass_ip4_t *reass = 0;
+  dlist_elt_t *elt, *per_reass_list_head_elt;
+  u32 elt_index;
+  f64 now = vlib_time_now (srm->vlib_main);
+  nat_reass_ip4_key_t k;
+  clib_bihash_kv_16_8_t kv;
+
+  clib_spinlock_lock_if_init (&srm->ip4_reass_lock);
+
+  if (srm->ip4_reass_n >= srm->ip4_max_reass)
+    {
+      nat_log_warn ("no free resassembly slot");
+      goto unlock;
+    }
+
+  pool_get (srm->ip4_reass_pool, reass);
+  pool_get (srm->ip4_reass_lru_list_pool, elt);
+  reass->lru_list_index = elt_index = elt - srm->ip4_reass_lru_list_pool;
+  clib_dlist_init (srm->ip4_reass_lru_list_pool, elt_index);
+  elt->value = reass - srm->ip4_reass_pool;
+  clib_dlist_addtail (srm->ip4_reass_lru_list_pool,
+		      srm->ip4_reass_head_index, elt_index);
+  pool_get (srm->ip4_frags_list_pool, per_reass_list_head_elt);
+  reass->frags_per_reass_list_head_index =
+    per_reass_list_head_elt - srm->ip4_frags_list_pool;
+  clib_dlist_init (srm->ip4_frags_list_pool,
+		   reass->frags_per_reass_list_head_index);
+  srm->ip4_reass_n++;
+  k.src.as_u32 = src.as_u32;
+  k.dst.as_u32 = dst.as_u32;
+  k.frag_id = frag_id;
+  k.proto = proto;
+  reass->key.as_u64[0] = kv.key[0] = k.as_u64[0];
+  reass->key.as_u64[1] = kv.key[1] = k.as_u64[1];
+  kv.value = reass - srm->ip4_reass_pool;
+  reass->sess_index = (u32) ~ 0;
+  reass->thread_index = (u32) ~ 0;
+  reass->last_heard = now;
+  reass->frag_n = 0;
+  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");
+
+unlock:
+  clib_spinlock_unlock_if_init (&srm->ip4_reass_lock);
+  return reass;
+}
+
 nat_reass_ip4_t *
 nat_ip4_reass_find_or_create (ip4_address_t src, ip4_address_t dst,
 			      u16 frag_id, u8 proto, u8 reset_timeout,
@@ -272,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);
-	  clib_warning ("no free resassembly slot");
+	  nat_log_warn ("no free resassembly slot");
 	  reass = 0;
 	  goto unlock;
 	}
@@ -335,8 +389,8 @@ unlock:
 }
 
 int
-nat_ip4_reass_add_fragment (nat_reass_ip4_t * reass, u32 bi,
-			    u32 ** bi_to_drop)
+nat_ip4_reass_add_fragment (u32 thread_index, nat_reass_ip4_t * reass,
+			    u32 bi, u32 ** bi_to_drop)
 {
   nat_reass_main_t *srm = &nat_reass_main;
   dlist_elt_t *elt;
@@ -344,7 +398,7 @@ nat_ip4_reass_add_fragment (nat_reass_ip4_t * reass, u32 bi,
 
   if (reass->frag_n >= srm->ip4_max_frag)
     {
-      nat_ipfix_logging_max_fragments_ip4 (srm->ip4_max_frag,
+      nat_ipfix_logging_max_fragments_ip4 (thread_index, srm->ip4_max_frag,
 					   &reass->key.src);
       reass->flags |= NAT_REASS_FLAG_MAX_FRAG_DROP;
       nat_ip4_reass_get_frags_inline (reass, bi_to_drop);
@@ -481,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);
-	  clib_warning ("no free resassembly slot");
+	  nat_log_warn ("no free resassembly slot");
 	  reass = 0;
 	  goto unlock;
 	}
@@ -541,8 +595,8 @@ unlock:
 }
 
 int
-nat_ip6_reass_add_fragment (nat_reass_ip6_t * reass, u32 bi,
-			    u32 ** bi_to_drop)
+nat_ip6_reass_add_fragment (u32 thread_index, nat_reass_ip6_t * reass,
+			    u32 bi, u32 ** bi_to_drop)
 {
   nat_reass_main_t *srm = &nat_reass_main;
   dlist_elt_t *elt;
@@ -550,7 +604,7 @@ nat_ip6_reass_add_fragment (nat_reass_ip6_t * reass, u32 bi,
 
   if (reass->frag_n >= srm->ip6_max_frag)
     {
-      nat_ipfix_logging_max_fragments_ip6 (srm->ip6_max_frag,
+      nat_ipfix_logging_max_fragments_ip6 (thread_index, srm->ip6_max_frag,
 					   &reass->key.src);
       reass->flags |= NAT_REASS_FLAG_MAX_FRAG_DROP;
       nat_ip6_reass_get_frags_inline (reass, bi_to_drop);