Improve ipfix template packet rewrite construction

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

diff --git a/src/plugins/nat/out2in.c b/src/plugins/nat/out2in.c
index 553883d..c0f5a3c 100755 (executable)
--- a/src/plugins/nat/out2in.c
+++ b/src/plugins/nat/out2in.c
@@ -333,11 +333,15 @@ next_src_nat (snat_main_t * sm, ip4_header_t * ip, u32 proto, u16 src_port,
 }
 
 static void
-create_bypass_for_fwd(snat_main_t * sm, ip4_header_t * ip)
+create_bypass_for_fwd(snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index,
+                      u32 thread_index)
 {
   nat_ed_ses_key_t key;
-  clib_bihash_kv_16_8_t kv;
+  clib_bihash_kv_16_8_t kv, value;
   udp_header_t *udp;
+  snat_user_t *u;
+  snat_session_t *s = 0;
+  snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
 
   if (ip->protocol == IP_PROTOCOL_ICMP)
     {
@@ -363,10 +367,55 @@ create_bypass_for_fwd(snat_main_t * sm, ip4_header_t * ip)
   key.fib_index = 0;
   kv.key[0] = key.as_u64[0];
   kv.key[1] = key.as_u64[1];
-  kv.value = ~0ULL;
 
-  if (clib_bihash_add_del_16_8 (&sm->in2out_ed, &kv, 1))
-    clib_warning ("in2out_ed key add failed");
+  if (!clib_bihash_search_16_8 (&sm->in2out_ed, &kv, &value))
+    {
+      s = pool_elt_at_index (tsm->sessions, value.value);
+    }
+  else
+    {
+      if (PREDICT_FALSE (maximum_sessions_exceeded(sm, thread_index)))
+        return;
+
+      u = nat_user_get_or_create (sm, &ip->dst_address, sm->inside_fib_index, thread_index);
+      if (!u)
+        {
+          clib_warning ("create NAT user failed");
+          return;
+        }
+
+      s = nat_session_alloc_or_recycle (sm, u, thread_index);
+      if (!s)
+        {
+          clib_warning ("create NAT session failed");
+          return;
+        }
+
+      s->ext_host_addr = key.r_addr;
+      s->ext_host_port = key.r_port;
+      s->flags |= SNAT_SESSION_FLAG_FWD_BYPASS;
+      s->outside_address_index = ~0;
+      s->out2in.addr = key.l_addr;
+      s->out2in.port = key.l_port;
+      s->out2in.protocol = ip_proto_to_snat_proto (key.proto);
+      s->out2in.fib_index = 0;
+      s->in2out = s->out2in;
+      user_session_increment (sm, u, 0);
+
+      kv.value = s - tsm->sessions;
+      if (clib_bihash_add_del_16_8 (&sm->in2out_ed, &kv, 1))
+        clib_warning ("in2out_ed key add failed");
+    }
+
+  if (ip->protocol == IP_PROTOCOL_TCP)
+    {
+      tcp_header_t *tcp = ip4_next_header(ip);
+      nat44_set_tcp_session_state (sm, s, tcp, thread_index);
+    }
+  /* Per-user LRU list maintenance */
+  clib_dlist_remove (tsm->list_pool, s->per_user_index);
+  clib_dlist_addtail (tsm->list_pool, s->per_user_list_head_index,
+                      s->per_user_index);
 }
 
 /**
@@ -446,7 +495,7 @@ u32 icmp_match_out2in_slow(snat_main_t *sm, vlib_node_runtime_t *node,
                   next0 = SNAT_OUT2IN_NEXT_IN2OUT;
                   goto out;
                 }
-              create_bypass_for_fwd(sm, ip0);
+              create_bypass_for_fwd(sm, ip0, rx_fib_index0, thread_index);
               goto out;
             }
         }
@@ -827,6 +876,7 @@ snat_out2in_unknown_proto (snat_main_t *sm,
       s->ext_host_addr.as_u32 = ip->src_address.as_u32;
       s->flags |= SNAT_SESSION_FLAG_UNKNOWN_PROTO;
       s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
+      s->flags |= SNAT_SESSION_FLAG_ENDPOINT_DEPENDENT;
       s->outside_address_index = ~0;
       s->out2in.addr.as_u32 = old_addr;
       s->out2in.fib_index = rx_fib_index;
@@ -891,7 +941,8 @@ snat_out2in_lb (snat_main_t *sm,
   snat_user_t *u;
   u32 address_index;
   snat_session_key_t eh_key;
-  u8 twice_nat, lb;
+  twice_nat_type_t twice_nat;
+  u8 lb;
 
   old_addr = ip->dst_address.as_u32;
 
@@ -943,6 +994,7 @@ snat_out2in_lb (snat_main_t *sm,
       s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
       if (lb)
         s->flags |= SNAT_SESSION_FLAG_LOAD_BALANCING;
+      s->flags |= SNAT_SESSION_FLAG_ENDPOINT_DEPENDENT;
       s->outside_address_index = ~0;
       s->out2in = e_key;
       s->in2out = l_key;
@@ -953,7 +1005,9 @@ snat_out2in_lb (snat_main_t *sm,
       if (clib_bihash_add_del_16_8 (&sm->out2in_ed, &s_kv, 1))
         clib_warning ("out2in-ed key add failed");
 
-      if (twice_nat)
+      if (twice_nat == TWICE_NAT ||
+          (twice_nat == TWICE_NAT_SELF &&
+           ip->src_address.as_u32 == l_key.addr.as_u32))
         {
           eh_key.protocol = proto;
           if (snat_alloc_outside_address_and_port (sm->twice_nat_addresses, 0,
@@ -1009,6 +1063,7 @@ snat_out2in_lb (snat_main_t *sm,
           ip->src_address.as_u32 = s->ext_host_nat_addr.as_u32;
         }
       tcp->checksum = ip_csum_fold(sum);
+      nat44_set_tcp_session_state (sm, s, tcp, thread_index);
     }
   else
     {
@@ -1193,7 +1248,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                           next0 = SNAT_OUT2IN_NEXT_IN2OUT;
                           goto trace0;
                         }
-                      create_bypass_for_fwd(sm, ip0);
+                      create_bypass_for_fwd(sm, ip0, rx_fib_index0, thread_index);
                       goto trace0;
                     }
                 }
@@ -1251,6 +1306,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                                      ip4_header_t /* cheat */,
                                      length /* changed member */);
               tcp0->checksum = ip_csum_fold(sum0);
+              nat44_set_tcp_session_state (sm, s0, tcp0, thread_index);
             }
           else
             {
@@ -1371,7 +1427,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                           next1 = SNAT_OUT2IN_NEXT_IN2OUT;
                           goto trace1;
                         }
-                      create_bypass_for_fwd(sm, ip1);
+                      create_bypass_for_fwd(sm, ip1, rx_fib_index1, thread_index);
                       goto trace1;
                     }
                 }
@@ -1429,6 +1485,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                                      ip4_header_t /* cheat */,
                                      length /* changed member */);
               tcp1->checksum = ip_csum_fold(sum1);
+              nat44_set_tcp_session_state (sm, s1, tcp1, thread_index);
             }
           else
             {
@@ -1585,7 +1642,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                           next0 = SNAT_OUT2IN_NEXT_IN2OUT;
                           goto trace00;
                         }
-                      create_bypass_for_fwd(sm, ip0);
+                      create_bypass_for_fwd(sm, ip0, rx_fib_index0, thread_index);
                       goto trace00;
                     }
                 }
@@ -1643,6 +1700,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                                      ip4_header_t /* cheat */,
                                      length /* changed member */);
               tcp0->checksum = ip_csum_fold(sum0);
+              nat44_set_tcp_session_state (sm, s0, tcp0, thread_index);
             }
           else
             {
@@ -1841,7 +1899,7 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm,
                               next0 = SNAT_OUT2IN_NEXT_IN2OUT;
                               goto trace0;
                             }
-                          create_bypass_for_fwd(sm, ip0);
+                          create_bypass_for_fwd(sm, ip0, rx_fib_index0, thread_index);
                           goto trace0;
                         }
                     }
@@ -1911,6 +1969,7 @@ nat44_out2in_reass_node_fn (vlib_main_t * vm,
                                          ip4_header_t /* cheat */,
                                          length /* changed member */);
                   tcp0->checksum = ip_csum_fold(sum0);
+                  nat44_set_tcp_session_state (sm, s0, tcp0, thread_index);
                 }
               else
                 {