NAT44: active-passive HA (VPP-1571)
[vpp.git] / src / plugins / nat / out2in_ed.c
index 1a9f897..41f9bfe 100644 (file)
 #include <nat/nat_ipfix_logging.h>
 #include <nat/nat_reass.h>
 #include <nat/nat_inlines.h>
+#include <nat/nat_syslog.h>
+#include <nat/nat_ha.h>
 
 #define foreach_nat_out2in_ed_error                     \
-_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
-_(OUT2IN_PACKETS, "Good out2in packets processed")      \
-_(OUT_OF_PORTS, "Out of ports")                         \
+_(UNSUPPORTED_PROTOCOL, "unsupported protocol")         \
+_(OUT2IN_PACKETS, "good out2in packets processed")      \
+_(OUT_OF_PORTS, "out of ports")                         \
 _(BAD_ICMP_TYPE, "unsupported ICMP type")               \
-_(NO_TRANSLATION, "No translation")                     \
-_(MAX_SESSIONS_EXCEEDED, "Maximum sessions exceeded")   \
-_(DROP_FRAGMENT, "Drop fragment")                       \
-_(MAX_REASS, "Maximum reassemblies exceeded")           \
-_(MAX_FRAG, "Maximum fragments per reassembly exceeded")
+_(NO_TRANSLATION, "no translation")                     \
+_(MAX_SESSIONS_EXCEEDED, "maximum sessions exceeded")   \
+_(DROP_FRAGMENT, "drop fragment")                       \
+_(MAX_REASS, "maximum reassemblies exceeded")           \
+_(MAX_FRAG, "maximum fragments per reassembly exceeded")\
+_(NON_SYN, "non-SYN packet try to create session")      \
+_(TCP_PACKETS, "TCP packets")                           \
+_(UDP_PACKETS, "UDP packets")                           \
+_(ICMP_PACKETS, "ICMP packets")                         \
+_(OTHER_PACKETS, "other protocol packets")              \
+_(FRAGMENTS, "fragments")                               \
+_(CACHED_FRAGMENTS, "cached fragments")                 \
+_(PROCESSED_FRAGMENTS, "processed fragments")
 
 typedef enum
 {
@@ -74,10 +84,6 @@ typedef struct
   u32 is_slow_path;
 } nat44_ed_out2in_trace_t;
 
-vlib_node_registration_t nat44_ed_out2in_node;
-vlib_node_registration_t nat44_ed_out2in_slowpath_node;
-vlib_node_registration_t nat44_ed_out2in_reass_node;
-
 static u8 *
 format_nat44_ed_out2in_trace (u8 * s, va_list * args)
 {
@@ -111,11 +117,14 @@ icmp_out2in_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0,
       /* Accounting */
       nat44_session_update_counters (s0, now,
                                     vlib_buffer_length_in_chain
-                                    (sm->vlib_main, b0));
+                                    (sm->vlib_main, b0), thread_index);
+      /* Per-user LRU list maintenance */
+      nat44_session_update_lru (sm, s0, thread_index);
     }
   return next0;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 int
 nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
 {
@@ -163,13 +172,25 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
       if (snat_is_unk_proto_session (s))
        goto delete;
 
-      snat_ipfix_logging_nat44_ses_delete (s->in2out.addr.as_u32,
+      snat_ipfix_logging_nat44_ses_delete (ctx->thread_index,
+                                          s->in2out.addr.as_u32,
                                           s->out2in.addr.as_u32,
                                           s->in2out.protocol,
                                           s->in2out.port,
                                           s->out2in.port,
                                           s->in2out.fib_index);
 
+      nat_syslog_nat44_sdel (s->user_index, s->in2out.fib_index,
+                            &s->in2out.addr, s->in2out.port,
+                            &s->ext_host_nat_addr, s->ext_host_nat_port,
+                            &s->out2in.addr, s->out2in.port,
+                            &s->ext_host_addr, s->ext_host_port,
+                            s->in2out.protocol, is_twice_nat_session (s));
+
+      nat_ha_sdel (&s->out2in.addr, s->out2in.port, &s->ext_host_addr,
+                  s->ext_host_port, s->out2in.protocol, s->out2in.fib_index,
+                  ctx->thread_index);
+
       if (is_twice_nat_session (s))
        {
          for (i = 0; i < vec_len (sm->twice_nat_addresses); i++)
@@ -199,6 +220,7 @@ nat44_o2i_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
 
   return 0;
 }
+#endif
 
 static snat_session_t *
 create_session_for_static_mapping_ed (snat_main_t * sm,
@@ -300,6 +322,26 @@ create_session_for_static_mapping_ed (snat_main_t * sm,
                                               &ctx))
     nat_log_notice ("in2out-ed key add failed");
 
+  snat_ipfix_logging_nat44_ses_create (thread_index,
+                                      s->in2out.addr.as_u32,
+                                      s->out2in.addr.as_u32,
+                                      s->in2out.protocol,
+                                      s->in2out.port,
+                                      s->out2in.port, s->in2out.fib_index);
+
+  nat_syslog_nat44_sadd (s->user_index, s->in2out.fib_index,
+                        &s->in2out.addr, s->in2out.port,
+                        &s->ext_host_nat_addr, s->ext_host_nat_port,
+                        &s->out2in.addr, s->out2in.port,
+                        &s->ext_host_addr, s->ext_host_port,
+                        s->in2out.protocol, is_twice_nat_session (s));
+
+  nat_ha_sadd (&s->in2out.addr, s->in2out.port, &s->out2in.addr,
+              s->out2in.port, &s->ext_host_addr, s->ext_host_port,
+              &s->ext_host_nat_addr, s->ext_host_nat_port,
+              s->in2out.protocol, s->in2out.fib_index, s->flags,
+              thread_index, 0);
+
   return s;
 }
 
@@ -452,9 +494,12 @@ create_bypass_for_fwd (snat_main_t * sm, ip4_header_t * ip, u32 rx_fib_index,
     }
 
   /* Accounting */
-  nat44_session_update_counters (s, now, 0);
+  nat44_session_update_counters (s, now, 0, thread_index);
+  /* Per-user LRU list maintenance */
+  nat44_session_update_lru (sm, s, thread_index);
 }
 
+#ifndef CLIB_MARCH_VARIANT
 u32
 icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
                      u32 thread_index, vlib_buffer_t * b, ip4_header_t * ip,
@@ -467,7 +512,7 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
   clib_bihash_kv_16_8_t kv, value;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
   snat_session_t *s = 0;
-  u8 dont_translate = 0, is_addr_only;
+  u8 dont_translate = 0, is_addr_only, identity_nat;
   snat_session_key_t e_key, l_key;
 
   icmp = (icmp46_header_t *) ip4_next_header (ip);
@@ -492,7 +537,7 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
       e_key.protocol = ip_proto_to_snat_proto (key.proto);
       e_key.fib_index = rx_fib_index;
       if (snat_static_mapping_match
-         (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0))
+         (sm, e_key, &l_key, 1, &is_addr_only, 0, 0, 0, &identity_nat))
        {
          if (!sm->forwarding_enabled)
            {
@@ -529,6 +574,12 @@ icmp_match_out2in_ed (snat_main_t * sm, vlib_node_runtime_t * node,
          goto out;
        }
 
+      if (PREDICT_FALSE (identity_nat))
+       {
+         dont_translate = 1;
+         goto out;
+       }
+
       /* Create session initiated by host from external network */
       s = create_session_for_static_mapping_ed (sm, b, l_key, e_key, node,
                                                thread_index, 0, 0,
@@ -564,6 +615,7 @@ out:
     *(snat_session_t **) d = s;
   return next;
 }
+#endif
 
 static snat_session_t *
 nat44_ed_out2in_unknown_proto (snat_main_t * sm,
@@ -662,7 +714,10 @@ nat44_ed_out2in_unknown_proto (snat_main_t * sm,
   vnet_buffer (b)->sw_if_index[VLIB_TX] = s->in2out.fib_index;
 
   /* Accounting */
-  nat44_session_update_counters (s, now, vlib_buffer_length_in_chain (vm, b));
+  nat44_session_update_counters (s, now, vlib_buffer_length_in_chain (vm, b),
+                                thread_index);
+  /* Per-user LRU list maintenance */
+  nat44_session_update_lru (sm, s, thread_index);
 
   return s;
 }
@@ -678,9 +733,11 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
   f64 now = vlib_time_now (vm);
   u32 thread_index = vm->thread_index;
   snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
+  u32 tcp_packets = 0, udp_packets = 0, icmp_packets = 0, other_packets =
+    0, fragments = 0;
 
-  stats_node_index = is_slow_path ? nat44_ed_out2in_slowpath_node.index :
-    nat44_ed_out2in_node.index;
+  stats_node_index = is_slow_path ? sm->ed_out2in_slowpath_node_index :
+    sm->ed_out2in_node_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -711,6 +768,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
          snat_session_key_t e_key0, l_key0, e_key1, l_key1;
          lb_nat_type_t lb_nat0, lb_nat1;
          twice_nat_type_t twice_nat0, twice_nat1;
+         u8 identity_nat0, identity_nat1;
 
          /* Prefetch next iteration. */
          {
@@ -769,6 +827,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                    nat44_ed_out2in_unknown_proto (sm, b0, ip0, rx_fib_index0,
                                                   thread_index, now, vm,
                                                   node);
+                 other_packets++;
                  if (!sm->forwarding_enabled)
                    {
                      if (!s0)
@@ -782,6 +841,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  next0 = icmp_out2in_ed_slow_path
                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                     next0, now, thread_index, &s0);
+                 icmp_packets++;
                  goto trace00;
                }
            }
@@ -796,6 +856,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
              if (ip4_is_fragment (ip0))
                {
                  next0 = NAT44_ED_OUT2IN_NEXT_REASS;
+                 fragments++;
                  goto trace00;
                }
 
@@ -822,7 +883,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  e_key0.fib_index = rx_fib_index0;
                  if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
                                                 &twice_nat0, &lb_nat0,
-                                                &ip0->src_address))
+                                                &ip0->src_address,
+                                                &identity_nat0))
                    {
                      /*
                       * Send DHCP packets to the ipv4 stack, or we won't
@@ -858,6 +920,16 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                      goto trace00;
                    }
 
+                 if (PREDICT_FALSE (identity_nat0))
+                   goto trace00;
+
+                 if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0))
+                   {
+                     b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN];
+                     next0 = NAT44_ED_OUT2IN_NEXT_DROP;
+                     goto trace00;
+                   }
+
                  /* Create session initiated by host from external network */
                  s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
                                                             e_key0, node,
@@ -917,6 +989,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
              tcp0->checksum = ip_csum_fold (sum0);
+             tcp_packets++;
              if (nat44_set_tcp_session_state_o2i
                  (sm, s0, tcp0, thread_index))
                goto trace00;
@@ -930,12 +1003,15 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
              udp0->checksum = 0;
+             udp_packets++;
            }
 
          /* Accounting */
          nat44_session_update_counters (s0, now,
-                                        vlib_buffer_length_in_chain (vm,
-                                                                     b0));
+                                        vlib_buffer_length_in_chain (vm, b0),
+                                        thread_index);
+         /* Per-user LRU list maintenance */
+         nat44_session_update_lru (sm, s0, thread_index);
 
        trace00:
          if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@ -951,7 +1027,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                t->session_index = s0 - tsm->sessions;
            }
 
-         pkts_processed += next0 != NAT44_ED_OUT2IN_NEXT_DROP;
+         pkts_processed += next0 == NAT44_ED_OUT2IN_NEXT_LOOKUP;
 
          next1 = NAT44_ED_OUT2IN_NEXT_LOOKUP;
          vnet_buffer (b1)->snat.flags = 0;
@@ -985,6 +1061,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                    nat44_ed_out2in_unknown_proto (sm, b1, ip1, rx_fib_index1,
                                                   thread_index, now, vm,
                                                   node);
+                 other_packets++;
                  if (!sm->forwarding_enabled)
                    {
                      if (!s1)
@@ -998,6 +1075,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  next1 = icmp_out2in_ed_slow_path
                    (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
                     next1, now, thread_index, &s1);
+                 icmp_packets++;
                  goto trace01;
                }
            }
@@ -1012,6 +1090,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
              if (ip4_is_fragment (ip1))
                {
                  next1 = NAT44_ED_OUT2IN_NEXT_REASS;
+                 fragments++;
                  goto trace01;
                }
 
@@ -1038,7 +1117,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  e_key1.fib_index = rx_fib_index1;
                  if (snat_static_mapping_match (sm, e_key1, &l_key1, 1, 0,
                                                 &twice_nat1, &lb_nat1,
-                                                &ip1->src_address))
+                                                &ip1->src_address,
+                                                &identity_nat1))
                    {
                      /*
                       * Send DHCP packets to the ipv4 stack, or we won't
@@ -1074,6 +1154,16 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                      goto trace01;
                    }
 
+                 if (PREDICT_FALSE (identity_nat1))
+                   goto trace01;
+
+                 if ((proto1 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp1))
+                   {
+                     b1->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN];
+                     next1 = NAT44_ED_OUT2IN_NEXT_DROP;
+                     goto trace01;
+                   }
+
                  /* Create session initiated by host from external network */
                  s1 = create_session_for_static_mapping_ed (sm, b1, l_key1,
                                                             e_key1, node,
@@ -1133,6 +1223,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  ip1->src_address.as_u32 = s1->ext_host_nat_addr.as_u32;
                }
              tcp1->checksum = ip_csum_fold (sum1);
+             tcp_packets++;
              if (nat44_set_tcp_session_state_o2i
                  (sm, s1, tcp1, thread_index))
                goto trace01;
@@ -1146,12 +1237,15 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  ip1->src_address.as_u32 = s1->ext_host_nat_addr.as_u32;
                }
              udp1->checksum = 0;
+             udp_packets++;
            }
 
          /* Accounting */
          nat44_session_update_counters (s1, now,
-                                        vlib_buffer_length_in_chain (vm,
-                                                                     b1));
+                                        vlib_buffer_length_in_chain (vm, b1),
+                                        thread_index);
+         /* Per-user LRU list maintenance */
+         nat44_session_update_lru (sm, s1, thread_index);
 
        trace01:
          if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@ -1167,7 +1261,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                t->session_index = s1 - tsm->sessions;
            }
 
-         pkts_processed += next1 != NAT44_ED_OUT2IN_NEXT_DROP;
+         pkts_processed += next1 == NAT44_ED_OUT2IN_NEXT_LOOKUP;
 
          /* verify speculative enqueues, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -1192,6 +1286,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
          snat_session_key_t e_key0, l_key0;
          lb_nat_type_t lb_nat0;
          twice_nat_type_t twice_nat0;
+         u8 identity_nat0;
 
          /* speculatively enqueue b0 to the current next frame */
          bi0 = from[0];
@@ -1234,6 +1329,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                    nat44_ed_out2in_unknown_proto (sm, b0, ip0, rx_fib_index0,
                                                   thread_index, now, vm,
                                                   node);
+                 other_packets++;
                  if (!sm->forwarding_enabled)
                    {
                      if (!s0)
@@ -1247,6 +1343,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  next0 = icmp_out2in_ed_slow_path
                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                     next0, now, thread_index, &s0);
+                 icmp_packets++;
                  goto trace0;
                }
            }
@@ -1261,6 +1358,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
              if (ip4_is_fragment (ip0))
                {
                  next0 = NAT44_ED_OUT2IN_NEXT_REASS;
+                 fragments++;
                  goto trace0;
                }
 
@@ -1287,7 +1385,8 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  e_key0.fib_index = rx_fib_index0;
                  if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
                                                 &twice_nat0, &lb_nat0,
-                                                &ip0->src_address))
+                                                &ip0->src_address,
+                                                &identity_nat0))
                    {
                      /*
                       * Send DHCP packets to the ipv4 stack, or we won't
@@ -1323,6 +1422,16 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                      goto trace0;
                    }
 
+                 if (PREDICT_FALSE (identity_nat0))
+                   goto trace0;
+
+                 if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0))
+                   {
+                     b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN];
+                     next0 = NAT44_ED_OUT2IN_NEXT_DROP;
+                     goto trace0;
+                   }
+
                  /* Create session initiated by host from external network */
                  s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
                                                             e_key0, node,
@@ -1382,6 +1491,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
              tcp0->checksum = ip_csum_fold (sum0);
+             tcp_packets++;
              if (nat44_set_tcp_session_state_o2i
                  (sm, s0, tcp0, thread_index))
                goto trace0;
@@ -1395,12 +1505,15 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                  ip0->src_address.as_u32 = s0->ext_host_nat_addr.as_u32;
                }
              udp0->checksum = 0;
+             udp_packets++;
            }
 
          /* Accounting */
          nat44_session_update_counters (s0, now,
-                                        vlib_buffer_length_in_chain (vm,
-                                                                     b0));
+                                        vlib_buffer_length_in_chain (vm, b0),
+                                        thread_index);
+         /* Per-user LRU list maintenance */
+         nat44_session_update_lru (sm, s0, thread_index);
 
        trace0:
          if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@ -1416,7 +1529,7 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
                t->session_index = s0 - tsm->sessions;
            }
 
-         pkts_processed += next0 != NAT44_ED_OUT2IN_NEXT_DROP;
+         pkts_processed += next0 == NAT44_ED_OUT2IN_NEXT_LOOKUP;
          /* verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
                                           to_next, n_left_to_next,
@@ -1429,20 +1542,30 @@ nat44_ed_out2in_node_fn_inline (vlib_main_t * vm,
   vlib_node_increment_counter (vm, stats_node_index,
                               NAT_OUT2IN_ED_ERROR_OUT2IN_PACKETS,
                               pkts_processed);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_OUT2IN_ED_ERROR_TCP_PACKETS, tcp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_OUT2IN_ED_ERROR_UDP_PACKETS, udp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_OUT2IN_ED_ERROR_ICMP_PACKETS,
+                              icmp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_OUT2IN_ED_ERROR_OTHER_PACKETS,
+                              other_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_OUT2IN_ED_ERROR_FRAGMENTS, fragments);
   return frame->n_vectors;
 }
 
-static uword
-nat44_ed_out2in_fast_path_fn (vlib_main_t * vm,
-                             vlib_node_runtime_t * node,
-                             vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_out2in_node) (vlib_main_t * vm,
+                                    vlib_node_runtime_t * node,
+                                    vlib_frame_t * frame)
 {
   return nat44_ed_out2in_node_fn_inline (vm, node, frame, 0);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_out2in_node) = {
-  .function = nat44_ed_out2in_fast_path_fn,
   .name = "nat44-ed-out2in",
   .vector_size = sizeof (u32),
   .format_trace = format_nat44_ed_out2in_trace,
@@ -1462,20 +1585,15 @@ VLIB_REGISTER_NODE (nat44_ed_out2in_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_out2in_node,
-                             nat44_ed_out2in_fast_path_fn);
-
-static uword
-nat44_ed_out2in_slow_path_fn (vlib_main_t * vm,
-                             vlib_node_runtime_t * node,
-                             vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_out2in_slowpath_node) (vlib_main_t * vm,
+                                             vlib_node_runtime_t * node,
+                                             vlib_frame_t * frame)
 {
   return nat44_ed_out2in_node_fn_inline (vm, node, frame, 1);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_out2in_slowpath_node) = {
-  .function = nat44_ed_out2in_slow_path_fn,
   .name = "nat44-ed-out2in-slowpath",
   .vector_size = sizeof (u32),
   .format_trace = format_nat44_ed_out2in_trace,
@@ -1495,13 +1613,9 @@ VLIB_REGISTER_NODE (nat44_ed_out2in_slowpath_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_out2in_slowpath_node,
-                             nat44_ed_out2in_slow_path_fn);
-
-static uword
-nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
-                              vlib_node_runtime_t * node,
-                              vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_out2in_reass_node) (vlib_main_t * vm,
+                                          vlib_node_runtime_t * node,
+                                          vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   nat44_ed_out2in_next_t next_index;
@@ -1542,6 +1656,7 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
          snat_session_key_t e_key0, l_key0;
          lb_nat_type_t lb0;
          twice_nat_type_t twice_nat0;
+         u8 identity_nat0;
 
          /* speculatively enqueue b0 to the current next frame */
          bi0 = from[0];
@@ -1622,7 +1737,8 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
                  e_key0.protocol = proto0;
                  e_key0.fib_index = rx_fib_index0;
                  if (snat_static_mapping_match (sm, e_key0, &l_key0, 1, 0,
-                                                &twice_nat0, &lb0, 0))
+                                                &twice_nat0, &lb0, 0,
+                                                &identity_nat0))
                    {
                      /*
                       * Send DHCP packets to the ipv4 stack, or we won't
@@ -1662,6 +1778,19 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
                      goto trace0;
                    }
 
+                 if (PREDICT_FALSE (identity_nat0))
+                   {
+                     reass0->flags |= NAT_REASS_FLAG_ED_DONT_TRANSLATE;
+                     goto trace0;
+                   }
+
+                 if ((proto0 == SNAT_PROTOCOL_TCP) && !tcp_is_init (tcp0))
+                   {
+                     b0->error = node->errors[NAT_OUT2IN_ED_ERROR_NON_SYN];
+                     next0 = NAT44_ED_OUT2IN_NEXT_DROP;
+                     goto trace0;
+                   }
+
                  /* Create session initiated by host from external network */
                  s0 = create_session_for_static_mapping_ed (sm, b0, l_key0,
                                                             e_key0, node,
@@ -1693,7 +1822,7 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
              if (PREDICT_FALSE (reass0->sess_index == (u32) ~ 0))
                {
                  if (nat_ip4_reass_add_fragment
-                     (reass0, bi0, &fragments_to_drop))
+                     (thread_index, reass0, bi0, &fragments_to_drop))
                    {
                      b0->error = node->errors[NAT_OUT2IN_ED_ERROR_MAX_FRAG];
                      nat_log_notice
@@ -1767,8 +1896,10 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
 
          /* Accounting */
          nat44_session_update_counters (s0, now,
-                                        vlib_buffer_length_in_chain (vm,
-                                                                     b0));
+                                        vlib_buffer_length_in_chain (vm, b0),
+                                        thread_index);
+         /* Per-user LRU list maintenance */
+         nat44_session_update_lru (sm, s0, thread_index);
 
        trace0:
          if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
@@ -1802,17 +1933,16 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
              u32 len = vec_len (fragments_to_loopback);
              if (len <= VLIB_FRAME_SIZE)
                {
-                 clib_memcpy (from, fragments_to_loopback,
-                              sizeof (u32) * len);
+                 clib_memcpy_fast (from, fragments_to_loopback,
+                                   sizeof (u32) * len);
                  n_left_from = len;
                  vec_reset_length (fragments_to_loopback);
                }
              else
                {
-                 clib_memcpy (from,
-                              fragments_to_loopback + (len -
-                                                       VLIB_FRAME_SIZE),
-                              sizeof (u32) * VLIB_FRAME_SIZE);
+                 clib_memcpy_fast (from, fragments_to_loopback +
+                                   (len - VLIB_FRAME_SIZE),
+                                   sizeof (u32) * VLIB_FRAME_SIZE);
                  n_left_from = VLIB_FRAME_SIZE;
                  _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
                }
@@ -1822,7 +1952,7 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, nat44_ed_out2in_reass_node.index,
+  vlib_node_increment_counter (vm, sm->ed_out2in_reass_node_index,
                               NAT_OUT2IN_ED_ERROR_OUT2IN_PACKETS,
                               pkts_processed);
 
@@ -1837,7 +1967,6 @@ nat44_ed_out2in_reass_node_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_out2in_reass_node) = {
-  .function = nat44_ed_out2in_reass_node_fn,
   .name = "nat44-ed-out2in-reass",
   .vector_size = sizeof (u32),
   .format_trace = format_nat44_reass_trace,
@@ -1856,9 +1985,6 @@ VLIB_REGISTER_NODE (nat44_ed_out2in_reass_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_out2in_reass_node,
-                             nat44_ed_out2in_reass_node_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *