NAT44: fix snat_get_worker_out2in_cb (VPP-1536)

Change-Id: I9c562f8e3407ca60a4412a162015fa505b7590b6
Signed-off-by: Matus Fabian <matfabia@cisco.com>

1 files changed, 36 insertions, 9 deletions

diff --git a/src/plugins/nat/nat.c b/src/plugins/nat/nat.c
index dabb8122adf..4e9d5023b3f 100755
--- a/src/plugins/nat/nat.c
+++ b/src/plugins/nat/nat.c
@@ -2862,20 +2862,47 @@ snat_get_worker_out2in_cb (ip4_header_t * ip0, u32 rx_fib_index0)
       if (PREDICT_FALSE (nat_reass_is_drop_frag (0)))
 	return vlib_get_thread_index ();
 
-      if (PREDICT_TRUE (!ip4_is_first_fragment (ip0)))
-	{
-	  nat_reass_ip4_t *reass;
+      nat_reass_ip4_t *reass;
+      reass = nat_ip4_reass_find (ip0->src_address, ip0->dst_address,
+				  ip0->fragment_id, ip0->protocol);
 
-	  reass = nat_ip4_reass_find (ip0->src_address, ip0->dst_address,
-				      ip0->fragment_id, ip0->protocol);
+      if (reass && (reass->thread_index != (u32) ~ 0))
+	return reass->thread_index;
 
-	  if (reass && (reass->thread_index != (u32) ~ 0))
-	    return reass->thread_index;
-	  else
-	    return vlib_get_thread_index ();
+      if (ip4_is_first_fragment (ip0))
+	{
+	  reass =
+	    nat_ip4_reass_create (ip0->src_address, ip0->dst_address,
+				  ip0->fragment_id, ip0->protocol);
+	  if (!reass)
+	    goto no_reass;
+
+	  if (PREDICT_FALSE (pool_elts (sm->static_mappings)))
+	    {
+	      m_key.addr = ip0->dst_address;
+	      m_key.port = clib_net_to_host_u16 (port);
+	      m_key.protocol = proto;
+	      m_key.fib_index = rx_fib_index0;
+	      kv.key = m_key.as_u64;
+	      if (!clib_bihash_search_8_8
+		  (&sm->static_mapping_by_external, &kv, &value))
+		{
+		  m = pool_elt_at_index (sm->static_mappings, value.value);
+		  reass->thread_index = m->workers[0];
+		  return reass->thread_index;
+		}
+	    }
+	  reass->thread_index = sm->first_worker_index;
+	  reass->thread_index +=
+	    sm->workers[(clib_net_to_host_u16 (port) - 1024) /
+			sm->port_per_thread];
+	  return reass->thread_index;
 	}
+      else
+	return vlib_get_thread_index ();
     }
 
+no_reass:
   /* unknown protocol */
   if (PREDICT_FALSE (proto == ~0))
     {