nat: use SVR
[vpp.git] / src / plugins / nat / in2out.c
index b99aef3..7eaaab2 100755 (executable)
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/fib/ip4_fib.h>
+#include <vnet/udp/udp.h>
 #include <nat/nat.h>
 #include <nat/nat_ipfix_logging.h>
-#include <nat/nat_reass.h>
 #include <nat/nat_inlines.h>
+#include <nat/nat44_inlines.h>
+#include <nat/nat_syslog.h>
+#include <nat/nat_ha.h>
 
 #include <vppinfra/hash.h>
 #include <vppinfra/error.h>
@@ -71,24 +74,22 @@ format_snat_in2out_fast_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t snat_in2out_node;
-vlib_node_registration_t snat_in2out_slowpath_node;
-vlib_node_registration_t snat_in2out_fast_node;
-vlib_node_registration_t snat_in2out_output_node;
-vlib_node_registration_t snat_in2out_output_slowpath_node;
-vlib_node_registration_t nat44_in2out_reass_node;
-
 #define foreach_snat_in2out_error                       \
-_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
-_(IN2OUT_PACKETS, "Good in2out packets processed")      \
-_(OUT_OF_PORTS, "Out of ports")                         \
-_(BAD_OUTSIDE_FIB, "Outside VRF ID not found")          \
+_(UNSUPPORTED_PROTOCOL, "unsupported protocol")         \
+_(IN2OUT_PACKETS, "good in2out packets processed")      \
+_(OUT_OF_PORTS, "out of ports")                         \
+_(BAD_OUTSIDE_FIB, "outside VRF ID not found")          \
 _(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")                       \
+_(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
 {
@@ -110,7 +111,6 @@ typedef enum
   SNAT_IN2OUT_NEXT_DROP,
   SNAT_IN2OUT_NEXT_ICMP_ERROR,
   SNAT_IN2OUT_NEXT_SLOW_PATH,
-  SNAT_IN2OUT_NEXT_REASS,
   SNAT_IN2OUT_N_NEXT,
 } snat_in2out_next_t;
 
@@ -190,6 +190,7 @@ nat_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip0,
   return 0;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 int
 nat44_i2o_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
 {
@@ -207,15 +208,25 @@ nat44_i2o_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
     {
       s_kv.key = s->out2in.as_u64;
       if (clib_bihash_add_del_8_8 (&tsm->out2in, &s_kv, 0))
-       nat_log_warn ("out2in key del failed");
+       nat_elog_warn ("out2in key del failed");
 
-      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_apmdel (s->user_index, s->in2out.fib_index,
+                              &s->in2out.addr, s->in2out.port,
+                              &s->out2in.addr, s->out2in.port,
+                              s->in2out.protocol);
+
+      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 (!snat_is_session_static (s))
        snat_free_outside_address_and_port (sm->addresses, ctx->thread_index,
                                            &s->out2in);
@@ -226,6 +237,7 @@ nat44_i2o_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
 
   return 0;
 }
+#endif
 
 static u32
 slow_path (snat_main_t * sm, vlib_buffer_t * b0,
@@ -239,7 +251,6 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
   snat_session_t *s = 0;
   clib_bihash_kv_8_8_t kv0;
   snat_session_key_t key1;
-  udp_header_t *udp0 = ip4_next_header (ip0);
   u8 is_sm = 0;
   nat_outside_fib_t *outside_fib;
   fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
@@ -253,11 +264,14 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
   };
   nat44_is_idle_session_ctx_t ctx0;
 
+  nat44_session_try_cleanup (&ip0->src_address, rx_fib_index0, thread_index,
+                            now);
+
   if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index)))
     {
       b0->error = node->errors[SNAT_IN2OUT_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 SNAT_IN2OUT_NEXT_DROP;
     }
 
@@ -293,15 +307,15 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
                              thread_index);
   if (!u)
     {
-      nat_log_warn ("create NAT user failed");
+      nat_elog_warn ("create NAT user failed");
       return SNAT_IN2OUT_NEXT_DROP;
     }
 
-  s = nat_session_alloc_or_recycle (sm, u, thread_index);
+  s = nat_session_alloc_or_recycle (sm, u, thread_index, now);
   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 SNAT_IN2OUT_NEXT_DROP;
     }
 
@@ -338,7 +352,7 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
       break;
     }
   s->ext_host_addr.as_u32 = ip0->dst_address.as_u32;
-  s->ext_host_port = udp0->dst_port;
+  s->ext_host_port = vnet_buffer (b0)->ip.reass.l4_dst_port;
   *sessionp = s;
 
   /* Add to translation hashes */
@@ -349,7 +363,7 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
   if (clib_bihash_add_or_overwrite_stale_8_8
       (&sm->per_thread_data[thread_index].in2out, &kv0,
        nat44_i2o_is_idle_session_cb, &ctx0))
-    nat_log_notice ("in2out key add failed");
+    nat_elog_notice ("in2out key add failed");
 
   kv0.key = s->out2in.as_u64;
   kv0.value = s - sm->per_thread_data[thread_index].sessions;
@@ -357,19 +371,32 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
   if (clib_bihash_add_or_overwrite_stale_8_8
       (&sm->per_thread_data[thread_index].out2in, &kv0,
        nat44_o2i_is_idle_session_cb, &ctx0))
-    nat_log_notice ("out2in key add failed");
+    nat_elog_notice ("out2in key add failed");
 
   /* 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,
                                       s->out2in.port, s->in2out.fib_index);
+
+  nat_syslog_nat44_apmadd (s->user_index, s->in2out.fib_index,
+                          &s->in2out.addr, s->in2out.port, &s->out2in.addr,
+                          s->out2in.port, s->in2out.protocol);
+
+  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 next0;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 static_always_inline
-  snat_in2out_error_t icmp_get_key (ip4_header_t * ip0,
+  snat_in2out_error_t icmp_get_key (vlib_buffer_t * b, ip4_header_t * ip0,
                                    snat_session_key_t * p_key0)
 {
   icmp46_header_t *icmp0;
@@ -382,11 +409,12 @@ static_always_inline
   icmp0 = (icmp46_header_t *) ip4_next_header (ip0);
   echo0 = (icmp_echo_header_t *) (icmp0 + 1);
 
-  if (!icmp_is_error_message (icmp0))
+  if (!icmp_type_is_error_message
+      (vnet_buffer (b)->ip.reass.icmp_type_or_tcp_flags))
     {
       key0.protocol = SNAT_PROTOCOL_ICMP;
       key0.addr = ip0->src_address;
-      key0.port = echo0->identifier;
+      key0.port = vnet_buffer (b)->ip.reass.l4_src_port;       // TODO fixme should this be dst port?
     }
   else
     {
@@ -434,7 +462,6 @@ icmp_match_in2out_slow (snat_main_t * sm, vlib_node_runtime_t * node,
                        snat_session_key_t * p_value,
                        u8 * p_dont_translate, void *d, void *e)
 {
-  icmp46_header_t *icmp0;
   u32 sw_if_index0;
   u32 rx_fib_index0;
   snat_session_key_t key0;
@@ -444,11 +471,10 @@ icmp_match_in2out_slow (snat_main_t * sm, vlib_node_runtime_t * node,
   u32 next0 = ~0;
   int err;
 
-  icmp0 = (icmp46_header_t *) ip4_next_header (ip0);
   sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
   rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index (sw_if_index0);
 
-  err = icmp_get_key (ip0, &key0);
+  err = icmp_get_key (b0, ip0, &key0);
   if (err != -1)
     {
       b0->error = node->errors[err];
@@ -487,7 +513,9 @@ icmp_match_in2out_slow (snat_main_t * sm, vlib_node_runtime_t * node,
            }
        }
 
-      if (PREDICT_FALSE (icmp_is_error_message (icmp0)))
+      if (PREDICT_FALSE
+         (icmp_type_is_error_message
+          (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags)))
        {
          b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_ICMP_TYPE];
          next0 = SNAT_IN2OUT_NEXT_DROP;
@@ -508,9 +536,13 @@ icmp_match_in2out_slow (snat_main_t * sm, vlib_node_runtime_t * node,
     }
   else
     {
-      if (PREDICT_FALSE (icmp0->type != ICMP4_echo_request &&
-                        icmp0->type != ICMP4_echo_reply &&
-                        !icmp_is_error_message (icmp0)))
+      if (PREDICT_FALSE
+         (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_request
+          && vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_reply
+          && !icmp_type_is_error_message (vnet_buffer (b0)->ip.
+                                          reass.icmp_type_or_tcp_flags)))
        {
          b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_ICMP_TYPE];
          next0 = SNAT_IN2OUT_NEXT_DROP;
@@ -530,7 +562,9 @@ out:
     *(snat_session_t **) d = s0;
   return next0;
 }
+#endif
 
+#ifndef CLIB_MARCH_VARIANT
 /**
  * Get address and port values to be used for ICMP packet translation
  *
@@ -551,7 +585,6 @@ icmp_match_in2out_fast (snat_main_t * sm, vlib_node_runtime_t * node,
                        snat_session_key_t * p_value,
                        u8 * p_dont_translate, void *d, void *e)
 {
-  icmp46_header_t *icmp0;
   u32 sw_if_index0;
   u32 rx_fib_index0;
   snat_session_key_t key0;
@@ -561,11 +594,10 @@ icmp_match_in2out_fast (snat_main_t * sm, vlib_node_runtime_t * node,
   u32 next0 = ~0;
   int err;
 
-  icmp0 = (icmp46_header_t *) ip4_next_header (ip0);
   sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
   rx_fib_index0 = ip4_fib_table_get_index_for_sw_if_index (sw_if_index0);
 
-  err = icmp_get_key (ip0, &key0);
+  err = icmp_get_key (b0, ip0, &key0);
   if (err != -1)
     {
       b0->error = node->errors[err];
@@ -585,7 +617,8 @@ icmp_match_in2out_fast (snat_main_t * sm, vlib_node_runtime_t * node,
          goto out;
        }
 
-      if (icmp_is_error_message (icmp0))
+      if (icmp_type_is_error_message
+         (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags))
        {
          next0 = SNAT_IN2OUT_NEXT_DROP;
          goto out;
@@ -596,9 +629,12 @@ icmp_match_in2out_fast (snat_main_t * sm, vlib_node_runtime_t * node,
       goto out;
     }
 
-  if (PREDICT_FALSE (icmp0->type != ICMP4_echo_request &&
-                    (icmp0->type != ICMP4_echo_reply || !is_addr_only) &&
-                    !icmp_is_error_message (icmp0)))
+  if (PREDICT_FALSE
+      (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags != ICMP4_echo_request
+       && (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_reply || !is_addr_only)
+       && !icmp_type_is_error_message (vnet_buffer (b0)->ip.
+                                      reass.icmp_type_or_tcp_flags)))
     {
       b0->error = node->errors[SNAT_IN2OUT_ERROR_BAD_ICMP_TYPE];
       next0 = SNAT_IN2OUT_NEXT_DROP;
@@ -612,7 +648,9 @@ out2:
   *p_dont_translate = dont_translate;
   return next0;
 }
+#endif
 
+#ifndef CLIB_MARCH_VARIANT
 u32
 icmp_in2out (snat_main_t * sm,
             vlib_buffer_t * b0,
@@ -670,84 +708,90 @@ icmp_in2out (snat_main_t * sm,
                         src_address /* changed member */ );
   ip0->checksum = ip_csum_fold (sum0);
 
-  if (icmp0->checksum == 0)
-    icmp0->checksum = 0xffff;
-
-  if (!icmp_is_error_message (icmp0))
+  if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
     {
-      new_id0 = sm0.port;
-      if (PREDICT_FALSE (new_id0 != echo0->identifier))
-       {
-         old_id0 = echo0->identifier;
-         new_id0 = sm0.port;
-         echo0->identifier = new_id0;
+      if (icmp0->checksum == 0)
+       icmp0->checksum = 0xffff;
 
-         sum0 = icmp0->checksum;
-         sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
-                                identifier);
-         icmp0->checksum = ip_csum_fold (sum0);
-       }
-    }
-  else
-    {
-      inner_ip0 = (ip4_header_t *) (echo0 + 1);
-      l4_header = ip4_next_header (inner_ip0);
-
-      if (!ip4_header_checksum_is_valid (inner_ip0))
+      if (!icmp_type_is_error_message (icmp0->type))
        {
-         next0 = SNAT_IN2OUT_NEXT_DROP;
-         goto out;
+         new_id0 = sm0.port;
+         if (PREDICT_FALSE (new_id0 != echo0->identifier))
+           {
+             old_id0 = echo0->identifier;
+             new_id0 = sm0.port;
+             echo0->identifier = new_id0;
+
+             sum0 = icmp0->checksum;
+             sum0 =
+               ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
+                               identifier);
+             icmp0->checksum = ip_csum_fold (sum0);
+           }
        }
-
-      /* update inner destination IP address */
-      old_addr0 = inner_ip0->dst_address.as_u32;
-      inner_ip0->dst_address = sm0.addr;
-      new_addr0 = inner_ip0->dst_address.as_u32;
-      sum0 = icmp0->checksum;
-      sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                            dst_address /* changed member */ );
-      icmp0->checksum = ip_csum_fold (sum0);
-
-      /* update inner IP header checksum */
-      old_checksum0 = inner_ip0->checksum;
-      sum0 = inner_ip0->checksum;
-      sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                            dst_address /* changed member */ );
-      inner_ip0->checksum = ip_csum_fold (sum0);
-      new_checksum0 = inner_ip0->checksum;
-      sum0 = icmp0->checksum;
-      sum0 = ip_csum_update (sum0, old_checksum0, new_checksum0, ip4_header_t,
-                            checksum);
-      icmp0->checksum = ip_csum_fold (sum0);
-
-      switch (protocol)
+      else
        {
-       case SNAT_PROTOCOL_ICMP:
-         inner_icmp0 = (icmp46_header_t *) l4_header;
-         inner_echo0 = (icmp_echo_header_t *) (inner_icmp0 + 1);
+         inner_ip0 = (ip4_header_t *) (echo0 + 1);
+         l4_header = ip4_next_header (inner_ip0);
 
-         old_id0 = inner_echo0->identifier;
-         new_id0 = sm0.port;
-         inner_echo0->identifier = new_id0;
+         if (!ip4_header_checksum_is_valid (inner_ip0))
+           {
+             next0 = SNAT_IN2OUT_NEXT_DROP;
+             goto out;
+           }
 
+         /* update inner destination IP address */
+         old_addr0 = inner_ip0->dst_address.as_u32;
+         inner_ip0->dst_address = sm0.addr;
+         new_addr0 = inner_ip0->dst_address.as_u32;
          sum0 = icmp0->checksum;
-         sum0 = ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
-                                identifier);
+         sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                                dst_address /* changed member */ );
          icmp0->checksum = ip_csum_fold (sum0);
-         break;
-       case SNAT_PROTOCOL_UDP:
-       case SNAT_PROTOCOL_TCP:
-         old_id0 = ((tcp_udp_header_t *) l4_header)->dst_port;
-         new_id0 = sm0.port;
-         ((tcp_udp_header_t *) l4_header)->dst_port = new_id0;
 
+         /* update inner IP header checksum */
+         old_checksum0 = inner_ip0->checksum;
+         sum0 = inner_ip0->checksum;
+         sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
+                                dst_address /* changed member */ );
+         inner_ip0->checksum = ip_csum_fold (sum0);
+         new_checksum0 = inner_ip0->checksum;
          sum0 = icmp0->checksum;
-         sum0 = ip_csum_update (sum0, old_id0, new_id0, tcp_udp_header_t,
-                                dst_port);
+         sum0 =
+           ip_csum_update (sum0, old_checksum0, new_checksum0, ip4_header_t,
+                           checksum);
          icmp0->checksum = ip_csum_fold (sum0);
-         break;
-       default:
-         ASSERT (0);
+
+         switch (protocol)
+           {
+           case SNAT_PROTOCOL_ICMP:
+             inner_icmp0 = (icmp46_header_t *) l4_header;
+             inner_echo0 = (icmp_echo_header_t *) (inner_icmp0 + 1);
+
+             old_id0 = inner_echo0->identifier;
+             new_id0 = sm0.port;
+             inner_echo0->identifier = new_id0;
+
+             sum0 = icmp0->checksum;
+             sum0 =
+               ip_csum_update (sum0, old_id0, new_id0, icmp_echo_header_t,
+                               identifier);
+             icmp0->checksum = ip_csum_fold (sum0);
+             break;
+           case SNAT_PROTOCOL_UDP:
+           case SNAT_PROTOCOL_TCP:
+             old_id0 = ((tcp_udp_header_t *) l4_header)->dst_port;
+             new_id0 = sm0.port;
+             ((tcp_udp_header_t *) l4_header)->dst_port = new_id0;
+
+             sum0 = icmp0->checksum;
+             sum0 = ip_csum_update (sum0, old_id0, new_id0, tcp_udp_header_t,
+                                    dst_port);
+             icmp0->checksum = ip_csum_fold (sum0);
+             break;
+           default:
+             ASSERT (0);
+           }
        }
     }
 
@@ -762,6 +806,7 @@ icmp_in2out (snat_main_t * sm,
 out:
   return next0;
 }
+#endif
 
 static inline u32
 icmp_in2out_slow_path (snat_main_t * sm,
@@ -782,7 +827,7 @@ icmp_in2out_slow_path (snat_main_t * sm,
       /* 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);
     }
@@ -840,9 +885,11 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
   f64 now = vlib_time_now (vm);
   u32 stats_node_index;
   u32 thread_index = vm->thread_index;
+  u32 tcp_packets = 0, udp_packets = 0, icmp_packets = 0, other_packets =
+    0, fragments = 0;
 
-  stats_node_index = is_slow_path ? snat_in2out_slowpath_node.index :
-    snat_in2out_node.index;
+  stats_node_index = is_slow_path ? sm->in2out_slowpath_node_index :
+    sm->in2out_node_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -900,7 +947,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
          b1 = vlib_get_buffer (vm, bi1);
 
          if (is_output_feature)
-           iph_offset0 = vnet_buffer (b0)->ip.save_rewrite_length;
+           iph_offset0 = vnet_buffer (b0)->ip.reass.save_rewrite_length;
 
          ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) +
                                  iph_offset0);
@@ -939,6 +986,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                      b0->error =
                        node->errors[SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
                    }
+                 other_packets++;
                  goto trace00;
                }
 
@@ -947,27 +995,27 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  next0 = icmp_in2out_slow_path
                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0,
                     node, next0, now, thread_index, &s0);
+                 icmp_packets++;
                  goto trace00;
                }
            }
          else
            {
-             if (PREDICT_FALSE
-                 (proto0 == ~0 || proto0 == SNAT_PROTOCOL_ICMP))
+             if (PREDICT_FALSE (proto0 == ~0))
                {
                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
                  goto trace00;
                }
 
-             if (ip4_is_fragment (ip0))
+             if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
                {
-                 next0 = SNAT_IN2OUT_NEXT_REASS;
+                 next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
                  goto trace00;
                }
            }
 
          key0.addr = ip0->src_address;
-         key0.port = udp0->src_port;
+         key0.port = vnet_buffer (b0)->ip.reass.l4_src_port;
          key0.protocol = proto0;
          key0.fib_index = rx_fib_index0;
 
@@ -982,13 +1030,24 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                {
                  if (is_output_feature)
                    {
-                     if (PREDICT_FALSE (nat_not_translate_output_feature (sm,
-                                                                          ip0,
-                                                                          proto0,
-                                                                          udp0->src_port,
-                                                                          udp0->dst_port,
-                                                                          thread_index,
-                                                                          sw_if_index0)))
+                     if (PREDICT_FALSE
+                         (nat_not_translate_output_feature
+                          (sm, ip0, proto0,
+                           vnet_buffer (b0)->ip.reass.l4_src_port,
+                           vnet_buffer (b0)->ip.reass.l4_dst_port,
+                           thread_index, sw_if_index0)))
+                       goto trace00;
+
+                     /*
+                      * Send DHCP packets to the ipv4 stack, or we won't
+                      * be able to use dhcp client on the outside interface
+                      */
+                     if (PREDICT_FALSE
+                         ((b0->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED)
+                          && proto0 == SNAT_PROTOCOL_UDP
+                          && (vnet_buffer (b0)->ip.reass.l4_dst_port ==
+                              clib_host_to_net_u16
+                              (UDP_DST_PORT_dhcp_to_server))))
                        goto trace00;
                    }
                  else
@@ -1033,33 +1092,50 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                                 src_address /* changed member */ );
          ip0->checksum = ip_csum_fold (sum0);
 
+
          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,
-                                    dst_address /* changed member */ );
-             sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                    ip4_header_t /* cheat */ ,
-                                    length /* changed member */ );
-             mss_clamping (sm, tcp0, &sum0);
-             tcp0->checksum = ip_csum_fold (sum0);
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port0 = vnet_buffer (b0)->ip.reass.l4_src_port;
+                 new_port0 = udp0->src_port = s0->out2in.port;
+                 sum0 = tcp0->checksum;
+                 sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                        ip4_header_t,
+                                        dst_address /* changed member */ );
+                 sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                        ip4_header_t /* cheat */ ,
+                                        length /* changed member */ );
+                 mss_clamping (sm, tcp0, &sum0);
+                 tcp0->checksum = ip_csum_fold (sum0);
+               }
+             tcp_packets++;
            }
          else
            {
-             old_port0 = udp0->src_port;
-             udp0->src_port = s0->out2in.port;
-             udp0->checksum = 0;
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 if (PREDICT_FALSE (udp0->checksum))
+                   {
+                     old_port0 = vnet_buffer (b0)->ip.reass.l4_src_port;
+                     new_port0 = udp0->src_port = s0->out2in.port;
+                     sum0 = udp0->checksum;
+                     sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t, dst_address      /* changed member */
+                       );
+                     sum0 =
+                       ip_csum_update (sum0, old_port0, new_port0,
+                                       ip4_header_t /* cheat */ ,
+                                       length /* changed member */ );
+                     udp0->checksum = ip_csum_fold (sum0);
+                   }
+               }
+             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:
@@ -1078,10 +1154,10 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  s0 - sm->per_thread_data[thread_index].sessions;
            }
 
-         pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
+         pkts_processed += next0 == SNAT_IN2OUT_NEXT_LOOKUP;
 
          if (is_output_feature)
-           iph_offset1 = vnet_buffer (b1)->ip.save_rewrite_length;
+           iph_offset1 = vnet_buffer (b1)->ip.reass.save_rewrite_length;
 
          ip1 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b1) +
                                  iph_offset1);
@@ -1118,6 +1194,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                      b1->error =
                        node->errors[SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
                    }
+                 other_packets++;
                  goto trace01;
                }
 
@@ -1126,27 +1203,27 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  next1 = icmp_in2out_slow_path
                    (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
                     next1, now, thread_index, &s1);
+                 icmp_packets++;
                  goto trace01;
                }
            }
          else
            {
-             if (PREDICT_FALSE
-                 (proto1 == ~0 || proto1 == SNAT_PROTOCOL_ICMP))
+             if (PREDICT_FALSE (proto1 == ~0))
                {
                  next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
                  goto trace01;
                }
 
-             if (ip4_is_fragment (ip1))
+             if (PREDICT_FALSE (proto1 == SNAT_PROTOCOL_ICMP))
                {
-                 next1 = SNAT_IN2OUT_NEXT_REASS;
+                 next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
                  goto trace01;
                }
            }
 
          key1.addr = ip1->src_address;
-         key1.port = udp1->src_port;
+         key1.port = vnet_buffer (b1)->ip.reass.l4_src_port;
          key1.protocol = proto1;
          key1.fib_index = rx_fib_index1;
 
@@ -1161,13 +1238,24 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                {
                  if (is_output_feature)
                    {
-                     if (PREDICT_FALSE (nat_not_translate_output_feature (sm,
-                                                                          ip1,
-                                                                          proto1,
-                                                                          udp1->src_port,
-                                                                          udp1->dst_port,
-                                                                          thread_index,
-                                                                          sw_if_index1)))
+                     if (PREDICT_FALSE
+                         (nat_not_translate_output_feature
+                          (sm, ip1, proto1,
+                           vnet_buffer (b1)->ip.reass.l4_src_port,
+                           vnet_buffer (b1)->ip.reass.l4_dst_port,
+                           thread_index, sw_if_index1)))
+                       goto trace01;
+
+                     /*
+                      * Send DHCP packets to the ipv4 stack, or we won't
+                      * be able to use dhcp client on the outside interface
+                      */
+                     if (PREDICT_FALSE
+                         ((b1->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED)
+                          && proto1 == SNAT_PROTOCOL_UDP
+                          && (vnet_buffer (b1)->ip.reass.l4_dst_port ==
+                              clib_host_to_net_u16
+                              (UDP_DST_PORT_dhcp_to_server))))
                        goto trace01;
                    }
                  else
@@ -1214,31 +1302,47 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
 
          if (PREDICT_TRUE (proto1 == SNAT_PROTOCOL_TCP))
            {
-             old_port1 = tcp1->src_port;
-             tcp1->src_port = s1->out2in.port;
-             new_port1 = tcp1->src_port;
-
-             sum1 = tcp1->checksum;
-             sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
-                                    ip4_header_t,
-                                    dst_address /* changed member */ );
-             sum1 = ip_csum_update (sum1, old_port1, new_port1,
-                                    ip4_header_t /* cheat */ ,
-                                    length /* changed member */ );
-             mss_clamping (sm, tcp1, &sum1);
-             tcp1->checksum = ip_csum_fold (sum1);
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port1 = vnet_buffer (b1)->ip.reass.l4_src_port;
+                 new_port1 = udp1->src_port = s1->out2in.port;
+                 sum1 = tcp1->checksum;
+                 sum1 = ip_csum_update (sum1, old_addr1, new_addr1,
+                                        ip4_header_t,
+                                        dst_address /* changed member */ );
+                 sum1 = ip_csum_update (sum1, old_port1, new_port1,
+                                        ip4_header_t /* cheat */ ,
+                                        length /* changed member */ );
+                 mss_clamping (sm, tcp1, &sum1);
+                 tcp1->checksum = ip_csum_fold (sum1);
+               }
+             tcp_packets++;
            }
          else
            {
-             old_port1 = udp1->src_port;
-             udp1->src_port = s1->out2in.port;
-             udp1->checksum = 0;
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 if (PREDICT_FALSE (udp1->checksum))
+                   {
+                     old_port1 = vnet_buffer (b1)->ip.reass.l4_src_port;
+                     new_port1 = udp1->src_port = s1->out2in.port;
+                     sum1 = udp1->checksum;
+                     sum1 = ip_csum_update (sum1, old_addr1, new_addr1, ip4_header_t, dst_address      /* changed member */
+                       );
+                     sum1 =
+                       ip_csum_update (sum1, old_port1, new_port1,
+                                       ip4_header_t /* cheat */ ,
+                                       length /* changed member */ );
+                     udp1->checksum = ip_csum_fold (sum1);
+                   }
+               }
+             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:
@@ -1256,7 +1360,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  s1 - sm->per_thread_data[thread_index].sessions;
            }
 
-         pkts_processed += next1 != SNAT_IN2OUT_NEXT_DROP;
+         pkts_processed += next1 == SNAT_IN2OUT_NEXT_LOOKUP;
 
          /* verify speculative enqueues, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -1296,7 +1400,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
          next0 = SNAT_IN2OUT_NEXT_LOOKUP;
 
          if (is_output_feature)
-           iph_offset0 = vnet_buffer (b0)->ip.save_rewrite_length;
+           iph_offset0 = vnet_buffer (b0)->ip.reass.save_rewrite_length;
 
          ip0 = (ip4_header_t *) ((u8 *) vlib_buffer_get_current (b0) +
                                  iph_offset0);
@@ -1333,6 +1437,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                      b0->error =
                        node->errors[SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
                    }
+                 other_packets++;
                  goto trace0;
                }
 
@@ -1341,27 +1446,27 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  next0 = icmp_in2out_slow_path
                    (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                     next0, now, thread_index, &s0);
+                 icmp_packets++;
                  goto trace0;
                }
            }
          else
            {
-             if (PREDICT_FALSE
-                 (proto0 == ~0 || proto0 == SNAT_PROTOCOL_ICMP))
+             if (PREDICT_FALSE (proto0 == ~0))
                {
                  next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
                  goto trace0;
                }
 
-             if (ip4_is_fragment (ip0))
+             if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
                {
-                 next0 = SNAT_IN2OUT_NEXT_REASS;
+                 next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
                  goto trace0;
                }
            }
 
          key0.addr = ip0->src_address;
-         key0.port = udp0->src_port;
+         key0.port = vnet_buffer (b0)->ip.reass.l4_src_port;
          key0.protocol = proto0;
          key0.fib_index = rx_fib_index0;
 
@@ -1374,13 +1479,24 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                {
                  if (is_output_feature)
                    {
-                     if (PREDICT_FALSE (nat_not_translate_output_feature (sm,
-                                                                          ip0,
-                                                                          proto0,
-                                                                          udp0->src_port,
-                                                                          udp0->dst_port,
-                                                                          thread_index,
-                                                                          sw_if_index0)))
+                     if (PREDICT_FALSE
+                         (nat_not_translate_output_feature
+                          (sm, ip0, proto0,
+                           vnet_buffer (b0)->ip.reass.l4_src_port,
+                           vnet_buffer (b0)->ip.reass.l4_dst_port,
+                           thread_index, sw_if_index0)))
+                       goto trace0;
+
+                     /*
+                      * Send DHCP packets to the ipv4 stack, or we won't
+                      * be able to use dhcp client on the outside interface
+                      */
+                     if (PREDICT_FALSE
+                         ((b0->flags & VNET_BUFFER_F_LOCALLY_ORIGINATED)
+                          && proto0 == SNAT_PROTOCOL_UDP
+                          && (vnet_buffer (b0)->ip.reass.l4_dst_port ==
+                              clib_host_to_net_u16
+                              (UDP_DST_PORT_dhcp_to_server))))
                        goto trace0;
                    }
                  else
@@ -1428,31 +1544,47 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
 
          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,
-                                    dst_address /* changed member */ );
-             sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                    ip4_header_t /* cheat */ ,
-                                    length /* changed member */ );
-             mss_clamping (sm, tcp0, &sum0);
-             tcp0->checksum = ip_csum_fold (sum0);
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port0 = vnet_buffer (b0)->ip.reass.l4_src_port;
+                 new_port0 = udp0->src_port = s0->out2in.port;
+                 sum0 = tcp0->checksum;
+                 sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                        ip4_header_t,
+                                        dst_address /* changed member */ );
+                 sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                        ip4_header_t /* cheat */ ,
+                                        length /* changed member */ );
+                 mss_clamping (sm, tcp0, &sum0);
+                 tcp0->checksum = ip_csum_fold (sum0);
+               }
+             tcp_packets++;
            }
          else
            {
-             old_port0 = udp0->src_port;
-             udp0->src_port = s0->out2in.port;
-             udp0->checksum = 0;
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 if (PREDICT_FALSE (udp0->checksum))
+                   {
+                     old_port0 = vnet_buffer (b0)->ip.reass.l4_src_port;
+                     new_port0 = udp0->src_port = s0->out2in.port;
+                     sum0 = udp0->checksum;
+                     sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t, dst_address      /* changed member */
+                       );
+                     sum0 =
+                       ip_csum_update (sum0, old_port0, new_port0,
+                                       ip4_header_t /* cheat */ ,
+                                       length /* changed member */ );
+                     udp0->checksum = ip_csum_fold (sum0);
+                   }
+               }
+             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);
 
@@ -1471,7 +1603,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  s0 - sm->per_thread_data[thread_index].sessions;
            }
 
-         pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
+         pkts_processed += next0 == SNAT_IN2OUT_NEXT_LOOKUP;
 
          /* verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -1485,12 +1617,24 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
   vlib_node_increment_counter (vm, stats_node_index,
                               SNAT_IN2OUT_ERROR_IN2OUT_PACKETS,
                               pkts_processed);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              SNAT_IN2OUT_ERROR_TCP_PACKETS, tcp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              SNAT_IN2OUT_ERROR_UDP_PACKETS, udp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              SNAT_IN2OUT_ERROR_ICMP_PACKETS, icmp_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              SNAT_IN2OUT_ERROR_OTHER_PACKETS,
+                              other_packets);
+  vlib_node_increment_counter (vm, stats_node_index,
+                              SNAT_IN2OUT_ERROR_FRAGMENTS, fragments);
+
   return frame->n_vectors;
 }
 
-static uword
-snat_in2out_fast_path_fn (vlib_main_t * vm,
-                         vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (snat_in2out_node) (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * frame)
 {
   return snat_in2out_node_fn_inline (vm, node, frame, 0 /* is_slow_path */ ,
                                     0);
@@ -1498,7 +1642,6 @@ snat_in2out_fast_path_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_in2out_node) = {
-  .function = snat_in2out_fast_path_fn,
   .name = "nat44-in2out",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_in2out_trace,
@@ -1517,17 +1660,13 @@ VLIB_REGISTER_NODE (snat_in2out_node) = {
     [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
     [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-slowpath",
     [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_IN2OUT_NEXT_REASS] = "nat44-in2out-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_node, snat_in2out_fast_path_fn);
-
-static uword
-snat_in2out_output_fast_path_fn (vlib_main_t * vm,
-                                vlib_node_runtime_t * node,
-                                vlib_frame_t * frame)
+VLIB_NODE_FN (snat_in2out_output_node) (vlib_main_t * vm,
+                                       vlib_node_runtime_t * node,
+                                       vlib_frame_t * frame)
 {
   return snat_in2out_node_fn_inline (vm, node, frame, 0 /* is_slow_path */ ,
                                     1);
@@ -1535,7 +1674,6 @@ snat_in2out_output_fast_path_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_in2out_output_node) = {
-  .function = snat_in2out_output_fast_path_fn,
   .name = "nat44-in2out-output",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_in2out_trace,
@@ -1554,17 +1692,13 @@ VLIB_REGISTER_NODE (snat_in2out_output_node) = {
     [SNAT_IN2OUT_NEXT_LOOKUP] = "interface-output",
     [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-output-slowpath",
     [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_IN2OUT_NEXT_REASS] = "nat44-in2out-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_output_node,
-                             snat_in2out_output_fast_path_fn);
-
-static uword
-snat_in2out_slow_path_fn (vlib_main_t * vm,
-                         vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (snat_in2out_slowpath_node) (vlib_main_t * vm,
+                                         vlib_node_runtime_t * node,
+                                         vlib_frame_t * frame)
 {
   return snat_in2out_node_fn_inline (vm, node, frame, 1 /* is_slow_path */ ,
                                     0);
@@ -1572,7 +1706,6 @@ snat_in2out_slow_path_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_in2out_slowpath_node) = {
-  .function = snat_in2out_slow_path_fn,
   .name = "nat44-in2out-slowpath",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_in2out_trace,
@@ -1591,18 +1724,13 @@ VLIB_REGISTER_NODE (snat_in2out_slowpath_node) = {
     [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
     [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-slowpath",
     [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_IN2OUT_NEXT_REASS] = "nat44-in2out-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_slowpath_node,
-                             snat_in2out_slow_path_fn);
-
-static uword
-snat_in2out_output_slow_path_fn (vlib_main_t * vm,
-                                vlib_node_runtime_t * node,
-                                vlib_frame_t * frame)
+VLIB_NODE_FN (snat_in2out_output_slowpath_node) (vlib_main_t * vm,
+                                                vlib_node_runtime_t * node,
+                                                vlib_frame_t * frame)
 {
   return snat_in2out_node_fn_inline (vm, node, frame, 1 /* is_slow_path */ ,
                                     1);
@@ -1610,7 +1738,6 @@ snat_in2out_output_slow_path_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_in2out_output_slowpath_node) = {
-  .function = snat_in2out_output_slow_path_fn,
   .name = "nat44-in2out-output-slowpath",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_in2out_trace,
@@ -1629,294 +1756,13 @@ VLIB_REGISTER_NODE (snat_in2out_output_slowpath_node) = {
     [SNAT_IN2OUT_NEXT_LOOKUP] = "interface-output",
     [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-output-slowpath",
     [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_IN2OUT_NEXT_REASS] = "nat44-in2out-reass",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_output_slowpath_node,
-                             snat_in2out_output_slow_path_fn);
-
-static uword
-nat44_in2out_reass_node_fn (vlib_main_t * vm,
-                           vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  snat_in2out_next_t next_index;
-  u32 pkts_processed = 0;
-  snat_main_t *sm = &snat_main;
-  f64 now = vlib_time_now (vm);
-  u32 thread_index = vm->thread_index;
-  snat_main_per_thread_data_t *per_thread_data =
-    &sm->per_thread_data[thread_index];
-  u32 *fragments_to_drop = 0;
-  u32 *fragments_to_loopback = 0;
-
-  from = vlib_frame_vector_args (frame);
-  n_left_from = frame->n_vectors;
-  next_index = node->cached_next_index;
-
-  while (n_left_from > 0)
-    {
-      u32 n_left_to_next;
-
-      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
-
-      while (n_left_from > 0 && n_left_to_next > 0)
-       {
-         u32 bi0, sw_if_index0, proto0, rx_fib_index0, new_addr0, old_addr0;
-         vlib_buffer_t *b0;
-         u32 next0;
-         u8 cached0 = 0;
-         ip4_header_t *ip0;
-         nat_reass_ip4_t *reass0;
-         udp_header_t *udp0;
-         tcp_header_t *tcp0;
-         snat_session_key_t key0;
-         clib_bihash_kv_8_8_t kv0, value0;
-         snat_session_t *s0 = 0;
-         u16 old_port0, new_port0;
-         ip_csum_t sum0;
-
-         /* speculatively enqueue b0 to the current next frame */
-         bi0 = from[0];
-         to_next[0] = bi0;
-         from += 1;
-         to_next += 1;
-         n_left_from -= 1;
-         n_left_to_next -= 1;
-
-         b0 = vlib_get_buffer (vm, bi0);
-         next0 = SNAT_IN2OUT_NEXT_LOOKUP;
-
-         sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-         rx_fib_index0 =
-           fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-                                                sw_if_index0);
-
-         if (PREDICT_FALSE (nat_reass_is_drop_frag (0)))
-           {
-             next0 = SNAT_IN2OUT_NEXT_DROP;
-             b0->error = node->errors[SNAT_IN2OUT_ERROR_DROP_FRAGMENT];
-             goto trace0;
-           }
-
-         ip0 = (ip4_header_t *) vlib_buffer_get_current (b0);
-         udp0 = ip4_next_header (ip0);
-         tcp0 = (tcp_header_t *) udp0;
-         proto0 = ip_proto_to_snat_proto (ip0->protocol);
-
-         reass0 = nat_ip4_reass_find_or_create (ip0->src_address,
-                                                ip0->dst_address,
-                                                ip0->fragment_id,
-                                                ip0->protocol,
-                                                1, &fragments_to_drop);
-
-         if (PREDICT_FALSE (!reass0))
-           {
-             next0 = SNAT_IN2OUT_NEXT_DROP;
-             b0->error = node->errors[SNAT_IN2OUT_ERROR_MAX_REASS];
-             nat_log_notice ("maximum reassemblies exceeded");
-             goto trace0;
-           }
-
-         if (PREDICT_FALSE (ip4_is_first_fragment (ip0)))
-           {
-             key0.addr = ip0->src_address;
-             key0.port = udp0->src_port;
-             key0.protocol = proto0;
-             key0.fib_index = rx_fib_index0;
-             kv0.key = key0.as_u64;
-
-             if (clib_bihash_search_8_8
-                 (&per_thread_data->in2out, &kv0, &value0))
-               {
-                 if (PREDICT_FALSE
-                     (snat_not_translate
-                      (sm, node, sw_if_index0, ip0, proto0, rx_fib_index0,
-                       thread_index)))
-                   goto trace0;
-
-                 next0 = slow_path (sm, b0, ip0, rx_fib_index0, &key0,
-                                    &s0, node, next0, thread_index, now);
-
-                 if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
-                   goto trace0;
-
-                 if (PREDICT_FALSE (!s0))
-                   goto trace0;
-
-                 reass0->sess_index = s0 - per_thread_data->sessions;
-               }
-             else
-               {
-                 s0 = pool_elt_at_index (per_thread_data->sessions,
-                                         value0.value);
-                 reass0->sess_index = value0.value;
-               }
-             nat_ip4_reass_get_frags (reass0, &fragments_to_loopback);
-           }
-         else
-           {
-             if (PREDICT_FALSE (reass0->sess_index == (u32) ~ 0))
-               {
-                 if (nat_ip4_reass_add_fragment
-                     (reass0, bi0, &fragments_to_drop))
-                   {
-                     b0->error = node->errors[SNAT_IN2OUT_ERROR_MAX_FRAG];
-                     nat_log_notice
-                       ("maximum fragments per reassembly exceeded");
-                     next0 = SNAT_IN2OUT_NEXT_DROP;
-                     goto trace0;
-                   }
-                 cached0 = 1;
-                 goto trace0;
-               }
-             s0 = pool_elt_at_index (per_thread_data->sessions,
-                                     reass0->sess_index);
-           }
-
-         old_addr0 = ip0->src_address.as_u32;
-         ip0->src_address = s0->out2in.addr;
-         new_addr0 = ip0->src_address.as_u32;
-         vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->out2in.fib_index;
-
-         sum0 = ip0->checksum;
-         sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                ip4_header_t,
-                                src_address /* changed member */ );
-         ip0->checksum = ip_csum_fold (sum0);
-
-         if (PREDICT_FALSE (ip4_is_first_fragment (ip0)))
-           {
-             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,
-                                        dst_address /* changed member */ );
-                 sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                        ip4_header_t /* cheat */ ,
-                                        length /* changed member */ );
-                 tcp0->checksum = ip_csum_fold (sum0);
-               }
-             else
-               {
-                 old_port0 = udp0->src_port;
-                 udp0->src_port = s0->out2in.port;
-                 udp0->checksum = 0;
-               }
-           }
-
-         /* Hairpinning */
-         nat44_reass_hairpinning (sm, b0, ip0, s0->out2in.port,
-                                  s0->ext_host_port, proto0, 0);
-
-         /* Accounting */
-         nat44_session_update_counters (s0, now,
-                                        vlib_buffer_length_in_chain (vm,
-                                                                     b0));
-         /* Per-user LRU list maintenance */
-         nat44_session_update_lru (sm, s0, thread_index);
-
-       trace0:
-         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-           {
-             nat44_reass_trace_t *t =
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-             t->cached = cached0;
-             t->sw_if_index = sw_if_index0;
-             t->next_index = next0;
-           }
-
-         if (cached0)
-           {
-             n_left_to_next++;
-             to_next--;
-           }
-         else
-           {
-             pkts_processed += next0 != SNAT_IN2OUT_NEXT_DROP;
-
-             /* verify speculative enqueue, maybe switch current next frame */
-             vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
-                                              to_next, n_left_to_next,
-                                              bi0, next0);
-           }
-
-         if (n_left_from == 0 && vec_len (fragments_to_loopback))
-           {
-             from = vlib_frame_vector_args (frame);
-             u32 len = vec_len (fragments_to_loopback);
-             if (len <= VLIB_FRAME_SIZE)
-               {
-                 clib_memcpy (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);
-                 n_left_from = VLIB_FRAME_SIZE;
-                 _vec_len (fragments_to_loopback) = len - VLIB_FRAME_SIZE;
-               }
-           }
-       }
-
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
-
-  vlib_node_increment_counter (vm, nat44_in2out_reass_node.index,
-                              SNAT_IN2OUT_ERROR_IN2OUT_PACKETS,
-                              pkts_processed);
-
-  nat_send_all_to_node (vm, fragments_to_drop, node,
-                       &node->errors[SNAT_IN2OUT_ERROR_DROP_FRAGMENT],
-                       SNAT_IN2OUT_NEXT_DROP);
-
-  vec_free (fragments_to_drop);
-  vec_free (fragments_to_loopback);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (nat44_in2out_reass_node) = {
-  .function = nat44_in2out_reass_node_fn,
-  .name = "nat44-in2out-reass",
-  .vector_size = sizeof (u32),
-  .format_trace = format_nat44_reass_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
-
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
-  .next_nodes = {
-    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
-    [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
-    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-slowpath",
-    [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_IN2OUT_NEXT_REASS] = "nat44-in2out-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_in2out_reass_node,
-                             nat44_in2out_reass_node_fn);
-
-static uword
-snat_in2out_fast_static_map_fn (vlib_main_t * vm,
-                               vlib_node_runtime_t * node,
-                               vlib_frame_t * frame)
+VLIB_NODE_FN (snat_in2out_fast_node) (vlib_main_t * vm,
+                                     vlib_node_runtime_t * node,
+                                     vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   snat_in2out_next_t next_index;
@@ -1924,7 +1770,7 @@ snat_in2out_fast_static_map_fn (vlib_main_t * vm,
   snat_main_t *sm = &snat_main;
   u32 stats_node_index;
 
-  stats_node_index = snat_in2out_fast_node.index;
+  stats_node_index = sm->in2out_fast_node_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -2021,11 +1867,11 @@ snat_in2out_fast_static_map_fn (vlib_main_t * vm,
 
          if (PREDICT_FALSE (new_port0 != udp0->dst_port))
            {
+             old_port0 = udp0->src_port;
+             udp0->src_port = new_port0;
+
              if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
                {
-                 old_port0 = tcp0->src_port;
-                 tcp0->src_port = new_port0;
-
                  sum0 = tcp0->checksum;
                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
                                         ip4_header_t,
@@ -2036,11 +1882,16 @@ snat_in2out_fast_static_map_fn (vlib_main_t * vm,
                  mss_clamping (sm, tcp0, &sum0);
                  tcp0->checksum = ip_csum_fold (sum0);
                }
-             else
+             else if (udp0->checksum)
                {
-                 old_port0 = udp0->src_port;
-                 udp0->src_port = new_port0;
-                 udp0->checksum = 0;
+                 sum0 = udp0->checksum;
+                 sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
+                                        ip4_header_t,
+                                        dst_address /* changed member */ );
+                 sum0 = ip_csum_update (sum0, old_port0, new_port0,
+                                        ip4_header_t /* cheat */ ,
+                                        length /* changed member */ );
+                 udp0->checksum = ip_csum_fold (sum0);
                }
            }
          else
@@ -2054,6 +1905,14 @@ snat_in2out_fast_static_map_fn (vlib_main_t * vm,
                  mss_clamping (sm, tcp0, &sum0);
                  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 /* changed member */ );
+                 udp0->checksum = ip_csum_fold (sum0);
+               }
            }
 
          /* Hairpinning */
@@ -2089,7 +1948,6 @@ snat_in2out_fast_static_map_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_in2out_fast_node) = {
-  .function = snat_in2out_fast_static_map_fn,
   .name = "nat44-in2out-fast",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_in2out_fast_trace,
@@ -2108,14 +1966,10 @@ VLIB_REGISTER_NODE (snat_in2out_fast_node) = {
     [SNAT_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
     [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-slowpath",
     [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_IN2OUT_NEXT_REASS] = "nat44-in2out-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (snat_in2out_fast_node,
-                             snat_in2out_fast_static_map_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *