nat: NAT udp counter & unit test fixes
[vpp.git] / src / plugins / nat / in2out_ed.c
index ab253e8..77d620f 100644 (file)
 #include <nat/nat_reass.h>
 #include <nat/nat_inlines.h>
 #include <nat/nat_syslog.h>
-
-#define foreach_nat_in2out_ed_error                       \
-_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
-_(IN2OUT_PACKETS, "Good in2out packets processed")      \
-_(OUT_OF_PORTS, "Out of ports")                         \
-_(BAD_ICMP_TYPE, "unsupported ICMP type")               \
-_(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")
-
-typedef enum
-{
-#define _(sym,str) NAT_IN2OUT_ED_ERROR_##sym,
-  foreach_nat_in2out_ed_error
-#undef _
-    NAT_IN2OUT_ED_N_ERROR,
-} nat_in2out_ed_error_t;
+#include <nat/nat_ha.h>
 
 static char *nat_in2out_ed_error_strings[] = {
 #define _(sym,string) string,
@@ -73,12 +55,6 @@ typedef struct
   u32 is_slow_path;
 } nat_in2out_ed_trace_t;
 
-vlib_node_registration_t nat44_ed_in2out_node;
-vlib_node_registration_t nat44_ed_in2out_slowpath_node;
-vlib_node_registration_t nat44_ed_in2out_output_node;
-vlib_node_registration_t nat44_ed_in2out_output_slowpath_node;
-vlib_node_registration_t nat44_ed_in2out_reass_node;
-
 static u8 *
 format_nat_in2out_ed_trace (u8 * s, va_list * args)
 {
@@ -97,55 +73,7 @@ format_nat_in2out_ed_trace (u8 * s, va_list * args)
   return s;
 }
 
-static_always_inline int
-icmp_get_ed_key (ip4_header_t * ip0, nat_ed_ses_key_t * p_key0)
-{
-  icmp46_header_t *icmp0;
-  nat_ed_ses_key_t key0;
-  icmp_echo_header_t *echo0, *inner_echo0 = 0;
-  ip4_header_t *inner_ip0 = 0;
-  void *l4_header = 0;
-  icmp46_header_t *inner_icmp0;
-
-  icmp0 = (icmp46_header_t *) ip4_next_header (ip0);
-  echo0 = (icmp_echo_header_t *) (icmp0 + 1);
-
-  if (!icmp_is_error_message (icmp0))
-    {
-      key0.proto = IP_PROTOCOL_ICMP;
-      key0.l_addr = ip0->src_address;
-      key0.r_addr = ip0->dst_address;
-      key0.l_port = echo0->identifier;
-      key0.r_port = 0;
-    }
-  else
-    {
-      inner_ip0 = (ip4_header_t *) (echo0 + 1);
-      l4_header = ip4_next_header (inner_ip0);
-      key0.proto = inner_ip0->protocol;
-      key0.r_addr = inner_ip0->src_address;
-      key0.l_addr = inner_ip0->dst_address;
-      switch (ip_proto_to_snat_proto (inner_ip0->protocol))
-       {
-       case SNAT_PROTOCOL_ICMP:
-         inner_icmp0 = (icmp46_header_t *) l4_header;
-         inner_echo0 = (icmp_echo_header_t *) (inner_icmp0 + 1);
-         key0.r_port = 0;
-         key0.l_port = inner_echo0->identifier;
-         break;
-       case SNAT_PROTOCOL_UDP:
-       case SNAT_PROTOCOL_TCP:
-         key0.l_port = ((tcp_udp_header_t *) l4_header)->dst_port;
-         key0.r_port = ((tcp_udp_header_t *) l4_header)->src_port;
-         break;
-       default:
-         return NAT_IN2OUT_ED_ERROR_UNSUPPORTED_PROTOCOL;
-       }
-    }
-  *p_key0 = key0;
-  return 0;
-}
-
+#ifndef CLIB_MARCH_VARIANT
 int
 nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
 {
@@ -186,12 +114,13 @@ nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
       ed_kv.key[0] = ed_key.as_u64[0];
       ed_kv.key[1] = ed_key.as_u64[1];
       if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &ed_kv, 0))
-       nat_log_warn ("out2in_ed key del failed");
+       nat_elog_warn ("out2in_ed key del failed");
 
       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,
@@ -205,6 +134,10 @@ nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
                             &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++)
@@ -234,6 +167,7 @@ nat44_i2o_ed_is_idle_session_cb (clib_bihash_kv_16_8_t * kv, void *arg)
 
   return 0;
 }
+#endif
 
 static inline u32
 icmp_in2out_ed_slow_path (snat_main_t * sm, vlib_buffer_t * b0,
@@ -250,7 +184,7 @@ icmp_in2out_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);
     }
@@ -288,8 +222,8 @@ slow_path_ed (snat_main_t * sm,
   if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index)))
     {
       b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_SESSIONS_EXCEEDED];
-      nat_ipfix_logging_max_sessions (sm->max_translations);
-      nat_log_notice ("maximum sessions exceeded");
+      nat_ipfix_logging_max_sessions (thread_index, sm->max_translations);
+      nat_elog_notice ("maximum sessions exceeded");
       return NAT_IN2OUT_ED_NEXT_DROP;
     }
 
@@ -308,7 +242,7 @@ slow_path_ed (snat_main_t * sm,
                                               sm->port_per_thread,
                                               tsm->snat_thread_index))
        {
-         nat_log_notice ("addresses exhausted");
+         nat_elog_notice ("addresses exhausted");
          b->error = node->errors[NAT_IN2OUT_ED_ERROR_OUT_OF_PORTS];
          return NAT_IN2OUT_ED_NEXT_DROP;
        }
@@ -336,7 +270,7 @@ slow_path_ed (snat_main_t * sm,
   u = nat_user_get_or_create (sm, &key->l_addr, rx_fib_index, thread_index);
   if (!u)
     {
-      nat_log_warn ("create NAT user failed");
+      nat_elog_warn ("create NAT user failed");
       if (!is_sm)
        snat_free_outside_address_and_port (sm->addresses,
                                            thread_index, &key1);
@@ -347,7 +281,7 @@ slow_path_ed (snat_main_t * sm,
   if (!s)
     {
       nat44_delete_user_with_no_session (sm, u, thread_index);
-      nat_log_warn ("create NAT session failed");
+      nat_elog_warn ("create NAT session failed");
       if (!is_sm)
        snat_free_outside_address_and_port (sm->addresses,
                                            thread_index, &key1);
@@ -399,7 +333,7 @@ slow_path_ed (snat_main_t * sm,
   if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->in2out_ed, kv,
                                               nat44_i2o_ed_is_idle_session_cb,
                                               &ctx))
-    nat_log_notice ("in2out-ed key add failed");
+    nat_elog_notice ("in2out-ed key add failed");
 
   make_ed_kv (kv, &key1.addr, &key->r_addr, key->proto, s->out2in.fib_index,
              key1.port, key->r_port);
@@ -407,12 +341,13 @@ slow_path_ed (snat_main_t * sm,
   if (clib_bihash_add_or_overwrite_stale_16_8 (&tsm->out2in_ed, kv,
                                               nat44_o2i_ed_is_idle_session_cb,
                                               &ctx))
-    nat_log_notice ("out2in-ed key add failed");
+    nat_elog_notice ("out2in-ed key add failed");
 
   *sessionp = s;
 
   /* log NAT event */
-  snat_ipfix_logging_nat44_ses_create (s->in2out.addr.as_u32,
+  snat_ipfix_logging_nat44_ses_create (thread_index,
+                                      s->in2out.addr.as_u32,
                                       s->out2in.addr.as_u32,
                                       s->in2out.protocol,
                                       s->in2out.port,
@@ -425,6 +360,12 @@ slow_path_ed (snat_main_t * sm,
                         &s->ext_host_addr, s->ext_host_port,
                         s->in2out.protocol, 0);
 
+  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 next;
 }
 
@@ -480,7 +421,7 @@ nat_not_translate_output_feature_fwd (snat_main_t * sm, ip4_header_t * ip,
   if (ip->protocol == IP_PROTOCOL_ICMP)
     {
       key.as_u64[0] = key.as_u64[1] = 0;
-      if (icmp_get_ed_key (ip, &key))
+      if (get_icmp_i2o_ed_key (ip, &key))
        return 0;
       key.fib_index = 0;
       kv.key[0] = key.as_u64[0];
@@ -511,7 +452,8 @@ nat_not_translate_output_feature_fwd (snat_main_t * sm, ip4_header_t * ip,
            }
          /* Accounting */
          nat44_session_update_counters (s, now,
-                                        vlib_buffer_length_in_chain (vm, b));
+                                        vlib_buffer_length_in_chain (vm, b),
+                                        thread_index);
          /* Per-user LRU list maintenance */
          nat44_session_update_lru (sm, s, thread_index);
          return 1;
@@ -544,9 +486,7 @@ nat44_ed_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip,
       s = pool_elt_at_index (tsm->sessions, value.value);
       if (nat44_is_ses_closed (s))
        {
-         nat_log_debug ("TCP close connection %U", format_snat_session,
-                        &sm->per_thread_data[thread_index], s);
-         nat_free_session_data (sm, s, thread_index);
+         nat_free_session_data (sm, s, thread_index, 0);
          nat44_delete_session (sm, s, thread_index);
        }
       else
@@ -577,6 +517,7 @@ nat44_ed_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip,
   return 0;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 u32
 icmp_match_in2out_ed (snat_main_t * sm, vlib_node_runtime_t * node,
                      u32 thread_index, vlib_buffer_t * b, ip4_header_t * ip,
@@ -599,7 +540,7 @@ icmp_match_in2out_ed (snat_main_t * sm, vlib_node_runtime_t * node,
   rx_fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
 
   key.as_u64[0] = key.as_u64[1] = 0;
-  err = icmp_get_ed_key (ip, &key);
+  err = get_icmp_i2o_ed_key (ip, &key);
   if (err != 0)
     {
       b->error = node->errors[err];
@@ -686,6 +627,7 @@ out:
     *(snat_session_t **) d = s;
   return next;
 }
+#endif
 
 static snat_session_t *
 nat44_ed_in2out_unknown_proto (snat_main_t * sm,
@@ -759,8 +701,8 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm,
       if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index)))
        {
          b->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_SESSIONS_EXCEEDED];
-         nat_ipfix_logging_max_sessions (sm->max_translations);
-         nat_log_notice ("maximum sessions exceeded");
+         nat_ipfix_logging_max_sessions (thread_index, sm->max_translations);
+         nat_elog_notice ("maximum sessions exceeded");
          return 0;
        }
 
@@ -768,7 +710,7 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm,
                                  thread_index);
       if (!u)
        {
-         nat_log_warn ("create NAT user failed");
+         nat_elog_warn ("create NAT user failed");
          return 0;
        }
 
@@ -837,7 +779,7 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm,
       if (!s)
        {
          nat44_delete_user_with_no_session (sm, u, thread_index);
-         nat_log_warn ("create NAT session failed");
+         nat_elog_warn ("create NAT session failed");
          return 0;
        }
 
@@ -858,13 +800,13 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm,
                  rx_fib_index, 0, 0);
       s_kv.value = s - tsm->sessions;
       if (clib_bihash_add_del_16_8 (&tsm->in2out_ed, &s_kv, 1))
-       nat_log_notice ("in2out key add failed");
+       nat_elog_notice ("in2out key add failed");
 
       make_ed_kv (&s_kv, &s->out2in.addr, &ip->dst_address, ip->protocol,
                  outside_fib_index, 0, 0);
       s_kv.value = s - tsm->sessions;
       if (clib_bihash_add_del_16_8 (&tsm->out2in_ed, &s_kv, 1))
-       nat_log_notice ("out2in key add failed");
+       nat_elog_notice ("out2in key add failed");
     }
 
   /* Update IP checksum */
@@ -873,7 +815,8 @@ nat44_ed_in2out_unknown_proto (snat_main_t * sm,
   ip->checksum = ip_csum_fold (sum);
 
   /* 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);
 
@@ -899,9 +842,11 @@ nat44_ed_in2out_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_in2out_slowpath_node.index :
-    nat44_ed_in2out_node.index;
+  stats_node_index = is_slow_path ? sm->ed_in2out_slowpath_node_index :
+    sm->ed_in2out_node_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -993,6 +938,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                                                      node);
                  if (!s0)
                    next0 = NAT_IN2OUT_ED_NEXT_DROP;
+                 other_packets++;
                  goto trace00;
                }
 
@@ -1001,6 +947,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                  next0 = icmp_in2out_ed_slow_path
                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                     next0, now, thread_index, &s0);
+                 icmp_packets++;
                  goto trace00;
                }
            }
@@ -1015,6 +962,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
              if (ip4_is_fragment (ip0))
                {
                  next0 = NAT_IN2OUT_ED_NEXT_REASS;
+                 fragments++;
                  goto trace00;
                }
 
@@ -1097,11 +1045,11 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                                   dst_address);
          ip0->checksum = ip_csum_fold (sum0);
 
+         old_port0 = udp0->src_port;
+         new_port0 = udp0->src_port = s0->out2in.port;
+
          if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
            {
-             old_port0 = tcp0->src_port;
-             new_port0 = tcp0->src_port = s0->out2in.port;
-
              sum0 = tcp0->checksum;
              sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
                                     dst_address);
@@ -1120,25 +1068,47 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                }
              mss_clamping (sm, tcp0, &sum0);
              tcp0->checksum = ip_csum_fold (sum0);
+             tcp_packets++;
              if (nat44_set_tcp_session_state_i2o
                  (sm, s0, tcp0, thread_index))
                goto trace00;
            }
+         else if (udp0->checksum)
+           {
+             sum0 = udp0->checksum;
+             sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                                    dst_address);
+             sum0 = ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
+                                    length);
+             if (PREDICT_FALSE (is_twice_nat_session (s0)))
+               {
+                 sum0 = ip_csum_update (sum0, ip0->dst_address.as_u32,
+                                        s0->ext_host_addr.as_u32,
+                                        ip4_header_t, dst_address);
+                 sum0 = ip_csum_update (sum0, tcp0->dst_port,
+                                        s0->ext_host_port, ip4_header_t,
+                                        length);
+                 udp0->dst_port = s0->ext_host_port;
+                 ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32;
+               }
+             udp0->checksum = ip_csum_fold (sum0);
+             udp_packets++;
+           }
          else
            {
-             udp0->src_port = s0->out2in.port;
-             udp0->checksum = 0;
              if (PREDICT_FALSE (is_twice_nat_session (s0)))
                {
                  udp0->dst_port = s0->ext_host_port;
                  ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32;
                }
+             udp_packets++;
            }
 
          /* Accounting */
          nat44_session_update_counters (s0, now,
                                         vlib_buffer_length_in_chain (vm,
-                                                                     b0));
+                                                                     b0),
+                                        thread_index);
          /* Per-user LRU list maintenance */
          nat44_session_update_lru (sm, s0, thread_index);
 
@@ -1156,7 +1126,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                t->session_index = s0 - tsm->sessions;
            }
 
-         pkts_processed += next0 != NAT_IN2OUT_ED_NEXT_DROP;
+         pkts_processed += next0 == NAT_IN2OUT_ED_NEXT_LOOKUP;
 
 
          next1 = NAT_IN2OUT_ED_NEXT_LOOKUP;
@@ -1197,6 +1167,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                                                      node);
                  if (!s1)
                    next1 = NAT_IN2OUT_ED_NEXT_DROP;
+                 other_packets++;
                  goto trace01;
                }
 
@@ -1205,6 +1176,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                  next1 = icmp_in2out_ed_slow_path
                    (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
                     next1, now, thread_index, &s1);
+                 icmp_packets++;
                  goto trace01;
                }
            }
@@ -1219,6 +1191,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
              if (ip4_is_fragment (ip1))
                {
                  next1 = NAT_IN2OUT_ED_NEXT_REASS;
+                 fragments++;
                  goto trace01;
                }
 
@@ -1301,11 +1274,11 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                                   dst_address);
          ip1->checksum = ip_csum_fold (sum1);
 
+         old_port1 = udp1->src_port;
+         new_port1 = udp1->src_port = s1->out2in.port;
+
          if (PREDICT_TRUE (proto1 == SNAT_PROTOCOL_TCP))
            {
-             old_port1 = tcp1->src_port;
-             new_port1 = tcp1->src_port = s1->out2in.port;
-
              sum1 = tcp1->checksum;
              sum1 = ip_csum_update (sum1, old_addr1, new_addr1, ip4_header_t,
                                     dst_address);
@@ -1324,25 +1297,47 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                }
              tcp1->checksum = ip_csum_fold (sum1);
              mss_clamping (sm, tcp1, &sum1);
+             tcp_packets++;
              if (nat44_set_tcp_session_state_i2o
                  (sm, s1, tcp1, thread_index))
                goto trace01;
            }
+         else if (udp1->checksum)
+           {
+             sum1 = udp1->checksum;
+             sum1 = ip_csum_update (sum1, old_addr1, new_addr1, ip4_header_t,
+                                    dst_address);
+             sum1 = ip_csum_update (sum1, old_port1, new_port1, ip4_header_t,
+                                    length);
+
+             if (PREDICT_FALSE (is_twice_nat_session (s1)))
+               {
+                 sum1 = ip_csum_update (sum1, ip1->dst_address.as_u32,
+                                        s1->ext_host_addr.as_u32,
+                                        ip4_header_t, dst_address);
+                 sum1 = ip_csum_update (sum1, tcp1->dst_port,
+                                        s1->ext_host_port, ip4_header_t,
+                                        length);
+                 udp1->dst_port = s1->ext_host_port;
+                 ip1->dst_address.as_u32 = s1->ext_host_addr.as_u32;
+               }
+             udp1->checksum = ip_csum_fold (sum1);
+             udp_packets++;
+           }
          else
            {
-             udp1->src_port = s1->out2in.port;
-             udp1->checksum = 0;
              if (PREDICT_FALSE (is_twice_nat_session (s1)))
                {
                  udp1->dst_port = s1->ext_host_port;
                  ip1->dst_address.as_u32 = s1->ext_host_addr.as_u32;
                }
+             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);
 
@@ -1360,7 +1355,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                t->session_index = s1 - tsm->sessions;
            }
 
-         pkts_processed += next1 != NAT_IN2OUT_ED_NEXT_DROP;
+         pkts_processed += next1 == NAT_IN2OUT_ED_NEXT_LOOKUP;
 
          /* verify speculative enqueues, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -1430,6 +1425,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                                                      node);
                  if (!s0)
                    next0 = NAT_IN2OUT_ED_NEXT_DROP;
+                 other_packets++;
                  goto trace0;
                }
 
@@ -1438,6 +1434,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                  next0 = icmp_in2out_ed_slow_path
                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                     next0, now, thread_index, &s0);
+                 icmp_packets++;
                  goto trace0;
                }
            }
@@ -1452,6 +1449,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
              if (ip4_is_fragment (ip0))
                {
                  next0 = NAT_IN2OUT_ED_NEXT_REASS;
+                 fragments++;
                  goto trace0;
                }
 
@@ -1534,11 +1532,11 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                                   dst_address);
          ip0->checksum = ip_csum_fold (sum0);
 
+         old_port0 = udp0->src_port;
+         new_port0 = udp0->src_port = s0->out2in.port;
+
          if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
            {
-             old_port0 = tcp0->src_port;
-             new_port0 = tcp0->src_port = s0->out2in.port;
-
              sum0 = tcp0->checksum;
              sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
                                     dst_address);
@@ -1557,25 +1555,46 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                }
              mss_clamping (sm, tcp0, &sum0);
              tcp0->checksum = ip_csum_fold (sum0);
+             tcp_packets++;
              if (nat44_set_tcp_session_state_i2o
                  (sm, s0, tcp0, thread_index))
                goto trace0;
            }
+         else if (udp0->checksum)
+           {
+             sum0 = udp0->checksum;
+             sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                                    dst_address);
+             sum0 = ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
+                                    length);
+             if (PREDICT_FALSE (is_twice_nat_session (s0)))
+               {
+                 sum0 = ip_csum_update (sum0, ip0->dst_address.as_u32,
+                                        s0->ext_host_addr.as_u32,
+                                        ip4_header_t, dst_address);
+                 sum0 = ip_csum_update (sum0, tcp0->dst_port,
+                                        s0->ext_host_port, ip4_header_t,
+                                        length);
+                 udp0->dst_port = s0->ext_host_port;
+                 ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32;
+               }
+             udp0->checksum = ip_csum_fold (sum0);
+             udp_packets++;
+           }
          else
            {
-             udp0->src_port = s0->out2in.port;
-             udp0->checksum = 0;
              if (PREDICT_FALSE (is_twice_nat_session (s0)))
                {
                  udp0->dst_port = s0->ext_host_port;
                  ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32;
                }
+             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);
 
@@ -1593,7 +1612,7 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
                t->session_index = s0 - tsm->sessions;
            }
 
-         pkts_processed += next0 != NAT_IN2OUT_ED_NEXT_DROP;
+         pkts_processed += next0 == NAT_IN2OUT_ED_NEXT_LOOKUP;
 
          /* verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -1607,20 +1626,31 @@ nat44_ed_in2out_node_fn_inline (vlib_main_t * vm,
   vlib_node_increment_counter (vm, stats_node_index,
                               NAT_IN2OUT_ED_ERROR_IN2OUT_PACKETS,
                               pkts_processed);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_IN2OUT_ED_ERROR_TCP_PACKETS, tcp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_IN2OUT_ED_ERROR_UDP_PACKETS, udp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_IN2OUT_ED_ERROR_ICMP_PACKETS,
+                              icmp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_IN2OUT_ED_ERROR_OTHER_PACKETS,
+                              other_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              NAT_IN2OUT_ED_ERROR_FRAGMENTS, fragments);
+
   return frame->n_vectors;
 }
 
-static uword
-nat44_ed_in2out_fast_path_fn (vlib_main_t * vm,
-                             vlib_node_runtime_t * node,
-                             vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_in2out_node) (vlib_main_t * vm,
+                                    vlib_node_runtime_t * node,
+                                    vlib_frame_t * frame)
 {
   return nat44_ed_in2out_node_fn_inline (vm, node, frame, 0, 0);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_in2out_node) = {
-  .function = nat44_ed_in2out_fast_path_fn,
   .name = "nat44-ed-in2out",
   .vector_size = sizeof (u32),
   .format_trace = format_nat_in2out_ed_trace,
@@ -1639,20 +1669,15 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_node,
-                             nat44_ed_in2out_fast_path_fn);
-
-static uword
-nat44_ed_in2out_output_fast_path_fn (vlib_main_t * vm,
-                                    vlib_node_runtime_t * node,
-                                    vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_in2out_output_node) (vlib_main_t * vm,
+                                           vlib_node_runtime_t * node,
+                                           vlib_frame_t * frame)
 {
   return nat44_ed_in2out_node_fn_inline (vm, node, frame, 0, 1);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_in2out_output_node) = {
-  .function = nat44_ed_in2out_output_fast_path_fn,
   .name = "nat44-ed-in2out-output",
   .vector_size = sizeof (u32),
   .format_trace = format_nat_in2out_ed_trace,
@@ -1671,20 +1696,15 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_output_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_output_node,
-                             nat44_ed_in2out_output_fast_path_fn);
-
-static uword
-nat44_ed_in2out_slow_path_fn (vlib_main_t * vm,
-                             vlib_node_runtime_t * node,
-                             vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_in2out_slowpath_node) (vlib_main_t * vm,
+                                             vlib_node_runtime_t * node,
+                                             vlib_frame_t * frame)
 {
   return nat44_ed_in2out_node_fn_inline (vm, node, frame, 1, 0);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_in2out_slowpath_node) = {
-  .function = nat44_ed_in2out_slow_path_fn,
   .name = "nat44-ed-in2out-slowpath",
   .vector_size = sizeof (u32),
   .format_trace = format_nat_in2out_ed_trace,
@@ -1703,20 +1723,16 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_slowpath_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_slowpath_node,
-                             nat44_ed_in2out_slow_path_fn);
-
-static uword
-nat44_ed_in2out_output_slow_path_fn (vlib_main_t * vm,
-                                    vlib_node_runtime_t * node,
-                                    vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_in2out_output_slowpath_node) (vlib_main_t * vm,
+                                                    vlib_node_runtime_t *
+                                                    node,
+                                                    vlib_frame_t * frame)
 {
   return nat44_ed_in2out_node_fn_inline (vm, node, frame, 1, 1);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_in2out_output_slowpath_node) = {
-  .function = nat44_ed_in2out_output_slow_path_fn,
   .name = "nat44-ed-in2out-output-slowpath",
   .vector_size = sizeof (u32),
   .format_trace = format_nat_in2out_ed_trace,
@@ -1735,9 +1751,6 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_output_slowpath_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_output_slowpath_node,
-                             nat44_ed_in2out_output_slow_path_fn);
-
 static inline uword
 nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
                                      vlib_node_runtime_t * node,
@@ -1746,7 +1759,7 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next;
   nat_in2out_ed_next_t next_index;
-  u32 pkts_processed = 0;
+  u32 pkts_processed = 0, cached_fragments = 0;
   snat_main_t *sm = &snat_main;
   f64 now = vlib_time_now (vm);
   u32 thread_index = vm->thread_index;
@@ -1827,7 +1840,7 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
            {
              next0 = NAT_IN2OUT_ED_NEXT_DROP;
              b0->error = node->errors[NAT_IN2OUT_ED_ERROR_MAX_REASS];
-             nat_log_notice ("maximum reassemblies exceeded");
+             nat_elog_notice ("maximum reassemblies exceeded");
              goto trace0;
            }
 
@@ -1927,10 +1940,10 @@ nat44_ed_in2out_reass_node_fn_inline (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_IN2OUT_ED_ERROR_MAX_FRAG];
-                     nat_log_notice
+                     nat_elog_notice
                        ("maximum fragments per reassembly exceeded");
                      next0 = NAT_IN2OUT_ED_NEXT_DROP;
                      goto trace0;
@@ -1960,12 +1973,11 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
 
          if (PREDICT_FALSE (ip4_is_first_fragment (ip0)))
            {
+             old_port0 = udp0->src_port;
+             new_port0 = udp0->src_port = s0->out2in.port;
+
              if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
                {
-                 old_port0 = tcp0->src_port;
-                 tcp0->src_port = s0->out2in.port;
-                 new_port0 = tcp0->src_port;
-
                  sum0 = tcp0->checksum;
                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
                                         ip4_header_t,
@@ -1986,11 +1998,30 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
                    }
                  tcp0->checksum = ip_csum_fold (sum0);
                }
+             else if (udp0->checksum)
+               {
+                 sum0 = udp0->checksum;
+                 sum0 =
+                   ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                                   dst_address);
+                 sum0 =
+                   ip_csum_update (sum0, old_port0, new_port0, ip4_header_t,
+                                   length);
+                 if (PREDICT_FALSE (is_twice_nat_session (s0)))
+                   {
+                     sum0 = ip_csum_update (sum0, ip0->dst_address.as_u32,
+                                            s0->ext_host_addr.as_u32,
+                                            ip4_header_t, dst_address);
+                     sum0 = ip_csum_update (sum0, tcp0->dst_port,
+                                            s0->ext_host_port, ip4_header_t,
+                                            length);
+                     udp0->dst_port = s0->ext_host_port;
+                     ip0->dst_address.as_u32 = s0->ext_host_addr.as_u32;
+                   }
+                 udp0->checksum = ip_csum_fold (sum0);
+               }
              else
                {
-                 old_port0 = udp0->src_port;
-                 udp0->src_port = s0->out2in.port;
-                 udp0->checksum = 0;
                  if (PREDICT_FALSE (is_twice_nat_session (s0)))
                    {
                      udp0->dst_port = s0->ext_host_port;
@@ -2005,8 +2036,8 @@ nat44_ed_in2out_reass_node_fn_inline (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);
 
@@ -2025,6 +2056,7 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
            {
              n_left_to_next++;
              to_next--;
+             cached_fragments++;
            }
          else
            {
@@ -2061,9 +2093,12 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, nat44_ed_in2out_reass_node.index,
-                              NAT_IN2OUT_ED_ERROR_IN2OUT_PACKETS,
+  vlib_node_increment_counter (vm, sm->ed_in2out_reass_node_index,
+                              NAT_IN2OUT_ED_ERROR_PROCESSED_FRAGMENTS,
                               pkts_processed);
+  vlib_node_increment_counter (vm, sm->ed_in2out_reass_node_index,
+                              NAT_IN2OUT_ED_ERROR_CACHED_FRAGMENTS,
+                              cached_fragments);
 
   nat_send_all_to_node (vm, fragments_to_drop, node,
                        &node->errors[NAT_IN2OUT_ED_ERROR_DROP_FRAGMENT],
@@ -2074,17 +2109,15 @@ nat44_ed_in2out_reass_node_fn_inline (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
-static uword
-nat44_ed_in2out_reass_node_fn (vlib_main_t * vm,
-                              vlib_node_runtime_t * node,
-                              vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_in2out_reass_node) (vlib_main_t * vm,
+                                          vlib_node_runtime_t * node,
+                                          vlib_frame_t * frame)
 {
   return nat44_ed_in2out_reass_node_fn_inline (vm, node, frame, 0);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_in2out_reass_node) = {
-  .function = nat44_ed_in2out_reass_node_fn,
   .name = "nat44-ed-in2out-reass",
   .vector_size = sizeof (u32),
   .format_trace = format_nat44_reass_trace,
@@ -2102,20 +2135,15 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_reass_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_reass_node,
-                             nat44_ed_in2out_reass_node_fn);
-
-static uword
-nat44_ed_in2out_reass_output_node_fn (vlib_main_t * vm,
-                                     vlib_node_runtime_t * node,
-                                     vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ed_in2out_reass_output_node) (vlib_main_t * vm,
+                                                 vlib_node_runtime_t * node,
+                                                 vlib_frame_t * frame)
 {
   return nat44_ed_in2out_reass_node_fn_inline (vm, node, frame, 1);
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (nat44_ed_in2out_reass_output_node) = {
-  .function = nat44_ed_in2out_reass_output_node_fn,
   .name = "nat44-ed-in2out-reass-output",
   .vector_size = sizeof (u32),
   .format_trace = format_nat44_reass_trace,
@@ -2133,9 +2161,6 @@ VLIB_REGISTER_NODE (nat44_ed_in2out_reass_output_node) = {
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_ed_in2out_reass_output_node,
-                             nat44_ed_in2out_reass_output_node_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *