nat: use correct data types for memory sizes
[vpp.git] / src / plugins / nat / out2in.c
index c4d1fbf..f920599 100755 (executable)
 #include <vnet/fib/ip4_fib.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>
@@ -68,20 +70,23 @@ format_snat_out2in_fast_trace (u8 * s, va_list * args)
   return s;
 }
 
-vlib_node_registration_t snat_out2in_node;
-vlib_node_registration_t snat_out2in_fast_node;
-vlib_node_registration_t nat44_out2in_reass_node;
-
 #define foreach_snat_out2in_error                       \
-_(UNSUPPORTED_PROTOCOL, "Unsupported protocol")         \
-_(OUT2IN_PACKETS, "Good out2in packets processed")      \
-_(OUT_OF_PORTS, "Out of ports")                         \
+_(UNSUPPORTED_PROTOCOL, "unsupported protocol")         \
+_(OUT2IN_PACKETS, "good out2in packets processed")      \
+_(OUT_OF_PORTS, "out of ports")                         \
 _(BAD_ICMP_TYPE, "unsupported ICMP type")               \
-_(NO_TRANSLATION, "No translation")                     \
-_(MAX_SESSIONS_EXCEEDED, "Maximum sessions exceeded")   \
-_(DROP_FRAGMENT, "Drop fragment")                       \
-_(MAX_REASS, "Maximum reassemblies exceeded")           \
-_(MAX_FRAG, "Maximum fragments per reassembly exceeded")
+_(NO_TRANSLATION, "no translation")                     \
+_(MAX_SESSIONS_EXCEEDED, "maximum sessions exceeded")   \
+_(DROP_FRAGMENT, "drop fragment")                       \
+_(MAX_REASS, "maximum reassemblies exceeded")           \
+_(MAX_FRAG, "maximum fragments per reassembly exceeded")\
+_(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
 {
@@ -102,10 +107,10 @@ typedef enum
   SNAT_OUT2IN_NEXT_DROP,
   SNAT_OUT2IN_NEXT_LOOKUP,
   SNAT_OUT2IN_NEXT_ICMP_ERROR,
-  SNAT_OUT2IN_NEXT_REASS,
   SNAT_OUT2IN_N_NEXT,
 } snat_out2in_next_t;
 
+#ifndef CLIB_MARCH_VARIANT
 int
 nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
 {
@@ -123,15 +128,25 @@ nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
     {
       s_kv.key = s->in2out.as_u64;
       if (clib_bihash_add_del_8_8 (&tsm->in2out, &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);
@@ -142,6 +157,7 @@ nat44_o2i_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
 
   return 0;
 }
+#endif
 
 /**
  * @brief Create session for static mapping.
@@ -172,10 +188,10 @@ create_session_for_static_mapping (snat_main_t * sm,
   udp_header_t *udp0;
   nat44_is_idle_session_ctx_t ctx0;
 
-  if (PREDICT_FALSE (maximum_sessions_exceeded (sm, thread_index)))
+  if (PREDICT_FALSE (nat44_maximum_sessions_exceeded (sm, thread_index)))
     {
       b0->error = node->errors[SNAT_OUT2IN_ERROR_MAX_SESSIONS_EXCEEDED];
-      nat_log_notice ("maximum sessions exceeded");
+      nat_elog_notice ("maximum sessions exceeded");
       return 0;
     }
 
@@ -186,15 +202,15 @@ create_session_for_static_mapping (snat_main_t * sm,
     nat_user_get_or_create (sm, &in2out.addr, in2out.fib_index, thread_index);
   if (!u)
     {
-      nat_log_warn ("create NAT user failed");
+      nat_elog_warn ("create NAT user failed");
       return 0;
     }
 
-  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 0;
     }
 
@@ -214,26 +230,39 @@ create_session_for_static_mapping (snat_main_t * sm,
   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;
 
   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 s;
 }
 
+#ifndef CLIB_MARCH_VARIANT
 static_always_inline
-  snat_out2in_error_t icmp_get_key (ip4_header_t * ip0,
+  snat_out2in_error_t icmp_get_key (vlib_buffer_t * b, ip4_header_t * ip0,
                                    snat_session_key_t * p_key0)
 {
   icmp46_header_t *icmp0;
@@ -246,11 +275,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->dst_address;
-      key0.port = echo0->identifier;
+      key0.port = vnet_buffer (b)->ip.reass.l4_src_port;       // TODO should this be dst port?
     }
   else
     {
@@ -298,7 +328,6 @@ icmp_match_out2in_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;
@@ -311,13 +340,12 @@ icmp_match_out2in_slow (snat_main_t * sm, vlib_node_runtime_t * node,
   int err;
   u8 identity_nat;
 
-  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);
 
   key0.protocol = 0;
 
-  err = icmp_get_key (ip0, &key0);
+  err = icmp_get_key (b0, ip0, &key0);
   if (err != -1)
     {
       b0->error = node->errors[SNAT_OUT2IN_ERROR_UNSUPPORTED_PROTOCOL];
@@ -356,9 +384,11 @@ icmp_match_out2in_slow (snat_main_t * sm, vlib_node_runtime_t * node,
            }
        }
 
-      if (PREDICT_FALSE (icmp0->type != ICMP4_echo_reply &&
-                        (icmp0->type != ICMP4_echo_request
-                         || !is_addr_only)))
+      if (PREDICT_FALSE
+         (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_reply
+          && (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+              ICMP4_echo_request || !is_addr_only)))
        {
          b0->error = node->errors[SNAT_OUT2IN_ERROR_BAD_ICMP_TYPE];
          next0 = SNAT_OUT2IN_NEXT_DROP;
@@ -383,9 +413,13 @@ icmp_match_out2in_slow (snat_main_t * sm, vlib_node_runtime_t * node,
     }
   else
     {
-      if (PREDICT_FALSE (icmp0->type != ICMP4_echo_reply &&
-                        icmp0->type != ICMP4_echo_request &&
-                        !icmp_is_error_message (icmp0)))
+      if (PREDICT_FALSE
+         (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_reply
+          && vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_request
+          && !icmp_type_is_error_message (vnet_buffer (b0)->ip.
+                                          reass.icmp_type_or_tcp_flags)))
        {
          b0->error = node->errors[SNAT_OUT2IN_ERROR_BAD_ICMP_TYPE];
          next0 = SNAT_OUT2IN_NEXT_DROP;
@@ -405,7 +439,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
  *
@@ -426,7 +462,6 @@ icmp_match_out2in_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;
@@ -436,11 +471,10 @@ icmp_match_out2in_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];
@@ -463,9 +497,12 @@ icmp_match_out2in_fast (snat_main_t * sm, vlib_node_runtime_t * node,
       goto out;
     }
 
-  if (PREDICT_FALSE (icmp0->type != ICMP4_echo_reply &&
-                    (icmp0->type != ICMP4_echo_request || !is_addr_only) &&
-                    !icmp_is_error_message (icmp0)))
+  if (PREDICT_FALSE
+      (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags != ICMP4_echo_reply
+       && (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags !=
+          ICMP4_echo_request || !is_addr_only)
+       && !icmp_type_is_error_message (vnet_buffer (b0)->ip.
+                                      reass.icmp_type_or_tcp_flags)))
     {
       b0->error = node->errors[SNAT_OUT2IN_ERROR_BAD_ICMP_TYPE];
       next0 = SNAT_OUT2IN_NEXT_DROP;
@@ -479,7 +516,9 @@ out2:
   *p_dont_translate = dont_translate;
   return next0;
 }
+#endif
 
+#ifndef CLIB_MARCH_VARIANT
 u32
 icmp_out2in (snat_main_t * sm,
             vlib_buffer_t * b0,
@@ -537,79 +576,85 @@ icmp_out2in (snat_main_t * sm,
                         dst_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))
+      if (icmp0->checksum == 0)
+       icmp0->checksum = 0xffff;
+
+      if (!icmp_type_is_error_message (icmp0->type))
        {
-         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 /* changed member */ );
-         icmp0->checksum = ip_csum_fold (sum0);
+         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 /* changed member */ );
+             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))
+      else
        {
-         next0 = SNAT_OUT2IN_NEXT_DROP;
-         goto out;
-       }
+         inner_ip0 = (ip4_header_t *) (echo0 + 1);
+         l4_header = ip4_next_header (inner_ip0);
 
-      old_addr0 = inner_ip0->src_address.as_u32;
-      inner_ip0->src_address = sm0.addr;
-      new_addr0 = inner_ip0->src_address.as_u32;
-
-      sum0 = icmp0->checksum;
-      sum0 = ip_csum_update (sum0, old_addr0, new_addr0, ip4_header_t,
-                            src_address /* changed member */ );
-      icmp0->checksum = ip_csum_fold (sum0);
-
-      switch (protocol)
-       {
-       case SNAT_PROTOCOL_ICMP:
-         inner_icmp0 = (icmp46_header_t *) l4_header;
-         inner_echo0 = (icmp_echo_header_t *) (inner_icmp0 + 1);
+         if (!ip4_header_checksum_is_valid (inner_ip0))
+           {
+             next0 = SNAT_OUT2IN_NEXT_DROP;
+             goto out;
+           }
 
-         old_id0 = inner_echo0->identifier;
-         new_id0 = sm0.port;
-         inner_echo0->identifier = new_id0;
+         old_addr0 = inner_ip0->src_address.as_u32;
+         inner_ip0->src_address = sm0.addr;
+         new_addr0 = inner_ip0->src_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,
+                                src_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)->src_port;
-         new_id0 = sm0.port;
-         ((tcp_udp_header_t *) l4_header)->src_port = new_id0;
 
-         sum0 = icmp0->checksum;
-         sum0 = ip_csum_update (sum0, old_id0, new_id0, tcp_udp_header_t,
-                                src_port);
-         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)->src_port;
+             new_id0 = sm0.port;
+             ((tcp_udp_header_t *) l4_header)->src_port = new_id0;
+
+             sum0 = icmp0->checksum;
+             sum0 = ip_csum_update (sum0, old_id0, new_id0, tcp_udp_header_t,
+                                    src_port);
+             icmp0->checksum = ip_csum_fold (sum0);
+             break;
+           default:
+             ASSERT (0);
+           }
        }
     }
 
 out:
   return next0;
 }
-
+#endif
 
 static inline u32
 icmp_out2in_slow_path (snat_main_t * sm,
@@ -630,7 +675,7 @@ icmp_out2in_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);
     }
@@ -668,9 +713,9 @@ nat_out2in_sm_unknown_proto (snat_main_t * sm,
   return 0;
 }
 
-static uword
-snat_out2in_node_fn (vlib_main_t * vm,
-                    vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (snat_out2in_node) (vlib_main_t * vm,
+                                vlib_node_runtime_t * node,
+                                vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   snat_out2in_next_t next_index;
@@ -678,6 +723,8 @@ snat_out2in_node_fn (vlib_main_t * vm,
   snat_main_t *sm = &snat_main;
   f64 now = vlib_time_now (vm);
   u32 thread_index = vm->thread_index;
+  u32 tcp_packets = 0, udp_packets = 0, icmp_packets = 0, other_packets =
+    0, fragments = 0;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -772,12 +819,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                      next0 = SNAT_OUT2IN_NEXT_DROP;
                    }
                }
-             goto trace0;
-           }
-
-         if (PREDICT_FALSE (ip4_is_fragment (ip0)))
-           {
-             next0 = SNAT_OUT2IN_NEXT_REASS;
+             other_packets++;
              goto trace0;
            }
 
@@ -786,11 +828,12 @@ snat_out2in_node_fn (vlib_main_t * vm,
              next0 = icmp_out2in_slow_path
                (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                 next0, now, thread_index, &s0);
+             icmp_packets++;
              goto trace0;
            }
 
          key0.addr = ip0->dst_address;
-         key0.port = udp0->dst_port;
+         key0.port = vnet_buffer (b0)->ip.reass.l4_dst_port;
          key0.protocol = proto0;
          key0.fib_index = rx_fib_index0;
 
@@ -808,10 +851,11 @@ snat_out2in_node_fn (vlib_main_t * vm,
                   * Send DHCP packets to the ipv4 stack, or we won't
                   * be able to use dhcp client on the outside interface
                   */
-                 if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_UDP
-                                    && (udp0->dst_port ==
-                                        clib_host_to_net_u16
-                                        (UDP_DST_PORT_dhcp_to_client))))
+                 if (PREDICT_FALSE
+                     (proto0 == SNAT_PROTOCOL_UDP
+                      && (vnet_buffer (b0)->ip.reass.l4_dst_port ==
+                          clib_host_to_net_u16
+                          (UDP_DST_PORT_dhcp_to_client))))
                    {
                      vnet_feature_next (&next0, b0);
                      goto trace0;
@@ -856,31 +900,47 @@ snat_out2in_node_fn (vlib_main_t * vm,
 
          if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
            {
-             old_port0 = tcp0->dst_port;
-             tcp0->dst_port = s0->in2out.port;
-             new_port0 = tcp0->dst_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);
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+                 new_port0 = udp0->dst_port = s0->in2out.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);
+               }
+             tcp_packets++;
            }
          else
            {
-             old_port0 = udp0->dst_port;
-             udp0->dst_port = s0->in2out.port;
-             udp0->checksum = 0;
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+                 new_port0 = udp0->dst_port = s0->in2out.port;
+                 if (PREDICT_FALSE (udp0->checksum))
+                   {
+                     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);
        trace0:
@@ -898,7 +958,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                  s0 - sm->per_thread_data[thread_index].sessions;
            }
 
-         pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
+         pkts_processed += next0 == SNAT_OUT2IN_NEXT_LOOKUP;
 
 
          ip1 = vlib_buffer_get_current (b1);
@@ -933,12 +993,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                      next1 = SNAT_OUT2IN_NEXT_DROP;
                    }
                }
-             goto trace1;
-           }
-
-         if (PREDICT_FALSE (ip4_is_fragment (ip1)))
-           {
-             next1 = SNAT_OUT2IN_NEXT_REASS;
+             other_packets++;
              goto trace1;
            }
 
@@ -947,11 +1002,12 @@ snat_out2in_node_fn (vlib_main_t * vm,
              next1 = icmp_out2in_slow_path
                (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
                 next1, now, thread_index, &s1);
+             icmp_packets++;
              goto trace1;
            }
 
          key1.addr = ip1->dst_address;
-         key1.port = udp1->dst_port;
+         key1.port = vnet_buffer (b1)->ip.reass.l4_dst_port;
          key1.protocol = proto1;
          key1.fib_index = rx_fib_index1;
 
@@ -969,10 +1025,11 @@ snat_out2in_node_fn (vlib_main_t * vm,
                   * Send DHCP packets to the ipv4 stack, or we won't
                   * be able to use dhcp client on the outside interface
                   */
-                 if (PREDICT_FALSE (proto1 == SNAT_PROTOCOL_UDP
-                                    && (udp1->dst_port ==
-                                        clib_host_to_net_u16
-                                        (UDP_DST_PORT_dhcp_to_client))))
+                 if (PREDICT_FALSE
+                     (proto1 == SNAT_PROTOCOL_UDP
+                      && (vnet_buffer (b1)->ip.reass.l4_dst_port ==
+                          clib_host_to_net_u16
+                          (UDP_DST_PORT_dhcp_to_client))))
                    {
                      vnet_feature_next (&next1, b1);
                      goto trace1;
@@ -1017,31 +1074,51 @@ snat_out2in_node_fn (vlib_main_t * vm,
 
          if (PREDICT_TRUE (proto1 == SNAT_PROTOCOL_TCP))
            {
-             old_port1 = tcp1->dst_port;
-             tcp1->dst_port = s1->in2out.port;
-             new_port1 = tcp1->dst_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 */ );
-             tcp1->checksum = ip_csum_fold (sum1);
+             if (!vnet_buffer (b1)->ip.reass.is_non_first_fragment)
+               {
+                 old_port1 = vnet_buffer (b1)->ip.reass.l4_dst_port;
+                 new_port1 = udp1->dst_port = s1->in2out.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 */ );
+                 tcp1->checksum = ip_csum_fold (sum1);
+               }
+             tcp_packets++;
            }
          else
            {
-             old_port1 = udp1->dst_port;
-             udp1->dst_port = s1->in2out.port;
-             udp1->checksum = 0;
+             if (!vnet_buffer (b1)->ip.reass.is_non_first_fragment)
+               {
+                 old_port1 = vnet_buffer (b1)->ip.reass.l4_dst_port;
+                 new_port1 = udp1->dst_port = s1->in2out.port;
+                 if (PREDICT_FALSE (udp1->checksum))
+                   {
+
+                     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);
        trace1:
@@ -1059,7 +1136,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                  s1 - sm->per_thread_data[thread_index].sessions;
            }
 
-         pkts_processed += next1 != SNAT_OUT2IN_NEXT_DROP;
+         pkts_processed += next1 == SNAT_OUT2IN_NEXT_LOOKUP;
 
          /* verify speculative enqueues, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x2 (vm, node, next_index,
@@ -1121,6 +1198,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                      next0 = SNAT_OUT2IN_NEXT_DROP;
                    }
                }
+             other_packets++;
              goto trace00;
            }
 
@@ -1134,22 +1212,17 @@ snat_out2in_node_fn (vlib_main_t * vm,
              goto trace00;
            }
 
-         if (PREDICT_FALSE (ip4_is_fragment (ip0)))
-           {
-             next0 = SNAT_OUT2IN_NEXT_REASS;
-             goto trace00;
-           }
-
          if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
            {
              next0 = icmp_out2in_slow_path
                (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
                 next0, now, thread_index, &s0);
+             icmp_packets++;
              goto trace00;
            }
 
          key0.addr = ip0->dst_address;
-         key0.port = udp0->dst_port;
+         key0.port = vnet_buffer (b0)->ip.reass.l4_dst_port;
          key0.protocol = proto0;
          key0.fib_index = rx_fib_index0;
 
@@ -1167,10 +1240,11 @@ snat_out2in_node_fn (vlib_main_t * vm,
                   * Send DHCP packets to the ipv4 stack, or we won't
                   * be able to use dhcp client on the outside interface
                   */
-                 if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_UDP
-                                    && (udp0->dst_port ==
-                                        clib_host_to_net_u16
-                                        (UDP_DST_PORT_dhcp_to_client))))
+                 if (PREDICT_FALSE
+                     (proto0 == SNAT_PROTOCOL_UDP
+                      && (vnet_buffer (b0)->ip.reass.l4_dst_port ==
+                          clib_host_to_net_u16
+                          (UDP_DST_PORT_dhcp_to_client))))
                    {
                      vnet_feature_next (&next0, b0);
                      goto trace00;
@@ -1215,31 +1289,48 @@ snat_out2in_node_fn (vlib_main_t * vm,
 
          if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
            {
-             old_port0 = tcp0->dst_port;
-             tcp0->dst_port = s0->in2out.port;
-             new_port0 = tcp0->dst_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);
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+                 new_port0 = udp0->dst_port = s0->in2out.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);
+               }
+             tcp_packets++;
            }
          else
            {
-             old_port0 = udp0->dst_port;
-             udp0->dst_port = s0->in2out.port;
-             udp0->checksum = 0;
+             if (!vnet_buffer (b0)->ip.reass.is_non_first_fragment)
+               {
+                 old_port0 = vnet_buffer (b0)->ip.reass.l4_dst_port;
+                 new_port0 = udp0->dst_port = s0->in2out.port;
+                 if (PREDICT_FALSE (udp0->checksum))
+                   {
+                     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:
@@ -1257,7 +1348,7 @@ snat_out2in_node_fn (vlib_main_t * vm,
                  s0 - sm->per_thread_data[thread_index].sessions;
            }
 
-         pkts_processed += next0 != SNAT_OUT2IN_NEXT_DROP;
+         pkts_processed += next0 == SNAT_OUT2IN_NEXT_LOOKUP;
 
          /* verify speculative enqueue, maybe switch current next frame */
          vlib_validate_buffer_enqueue_x1 (vm, node, next_index,
@@ -1268,15 +1359,26 @@ snat_out2in_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, snat_out2in_node.index,
+  vlib_node_increment_counter (vm, sm->out2in_node_index,
                               SNAT_OUT2IN_ERROR_OUT2IN_PACKETS,
                               pkts_processed);
+  vlib_node_increment_counter (vm, sm->out2in_node_index,
+                              SNAT_OUT2IN_ERROR_TCP_PACKETS, tcp_packets);
+  vlib_node_increment_counter (vm, sm->out2in_node_index,
+                              SNAT_OUT2IN_ERROR_UDP_PACKETS, udp_packets);
+  vlib_node_increment_counter (vm, sm->out2in_node_index,
+                              SNAT_OUT2IN_ERROR_ICMP_PACKETS, icmp_packets);
+  vlib_node_increment_counter (vm, sm->out2in_node_index,
+                              SNAT_OUT2IN_ERROR_OTHER_PACKETS,
+                              other_packets);
+  vlib_node_increment_counter (vm, sm->out2in_node_index,
+                              SNAT_OUT2IN_ERROR_FRAGMENTS, fragments);
+
   return frame->n_vectors;
 }
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_out2in_node) = {
-  .function = snat_out2in_node_fn,
   .name = "nat44-out2in",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_out2in_trace,
@@ -1294,342 +1396,13 @@ VLIB_REGISTER_NODE (snat_out2in_node) = {
     [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
     [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
     [SNAT_OUT2IN_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_OUT2IN_NEXT_REASS] = "nat44-out2in-reass",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_node, snat_out2in_node_fn);
-
-static uword
-nat44_out2in_reass_node_fn (vlib_main_t * vm,
-                           vlib_node_runtime_t * node, vlib_frame_t * frame)
-{
-  u32 n_left_from, *from, *to_next;
-  snat_out2in_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;
-         icmp46_header_t *icmp0;
-         snat_session_key_t key0, sm0;
-         clib_bihash_kv_8_8_t kv0, value0;
-         snat_session_t *s0 = 0;
-         u16 old_port0, new_port0;
-         ip_csum_t sum0;
-         u8 identity_nat0;
-
-         /* 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_OUT2IN_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_OUT2IN_NEXT_DROP;
-             b0->error = node->errors[SNAT_OUT2IN_ERROR_DROP_FRAGMENT];
-             goto trace0;
-           }
-
-         ip0 = (ip4_header_t *) vlib_buffer_get_current (b0);
-         udp0 = ip4_next_header (ip0);
-         tcp0 = (tcp_header_t *) udp0;
-         icmp0 = (icmp46_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_OUT2IN_NEXT_DROP;
-             b0->error = node->errors[SNAT_OUT2IN_ERROR_MAX_REASS];
-             nat_log_notice ("maximum reassemblies exceeded");
-             goto trace0;
-           }
-
-         if (PREDICT_FALSE (ip4_is_first_fragment (ip0)))
-           {
-             if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_ICMP))
-               {
-                 next0 = icmp_out2in_slow_path
-                   (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
-                    next0, now, thread_index, &s0);
-
-                 if (PREDICT_TRUE (next0 != SNAT_OUT2IN_NEXT_DROP))
-                   {
-                     if (s0)
-                       reass0->sess_index = s0 - per_thread_data->sessions;
-                     else
-                       reass0->flags |= NAT_REASS_FLAG_ED_DONT_TRANSLATE;
-                     reass0->thread_index = thread_index;
-                     nat_ip4_reass_get_frags (reass0,
-                                              &fragments_to_loopback);
-                   }
-
-                 goto trace0;
-               }
-
-             key0.addr = ip0->dst_address;
-             key0.port = udp0->dst_port;
-             key0.protocol = proto0;
-             key0.fib_index = rx_fib_index0;
-             kv0.key = key0.as_u64;
-
-             if (clib_bihash_search_8_8
-                 (&per_thread_data->out2in, &kv0, &value0))
-               {
-                 /* Try to match static mapping by external address and port,
-                    destination address and port in packet */
-                 if (snat_static_mapping_match
-                     (sm, key0, &sm0, 1, 0, 0, 0, 0, &identity_nat0))
-                   {
-                     /*
-                      * Send DHCP packets to the ipv4 stack, or we won't
-                      * be able to use dhcp client on the outside interface
-                      */
-                     if (PREDICT_FALSE (proto0 == SNAT_PROTOCOL_UDP
-                                        && (udp0->dst_port
-                                            ==
-                                            clib_host_to_net_u16
-                                            (UDP_DST_PORT_dhcp_to_client))))
-                       {
-                         vnet_feature_next (&next0, b0);
-                         goto trace0;
-                       }
-
-                     if (!sm->forwarding_enabled)
-                       {
-                         b0->error =
-                           node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-                         next0 = SNAT_OUT2IN_NEXT_DROP;
-                       }
-                     goto trace0;
-                   }
-
-                 if (PREDICT_FALSE (identity_nat0))
-                   goto trace0;
-
-                 /* Create session initiated by host from external network */
-                 s0 =
-                   create_session_for_static_mapping (sm, b0, sm0, key0,
-                                                      node, thread_index,
-                                                      now);
-                 if (!s0)
-                   {
-                     b0->error =
-                       node->errors[SNAT_OUT2IN_ERROR_NO_TRANSLATION];
-                     next0 = SNAT_OUT2IN_NEXT_DROP;
-                     goto trace0;
-                   }
-                 reass0->sess_index = s0 - per_thread_data->sessions;
-                 reass0->thread_index = thread_index;
-               }
-             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_OUT2IN_ERROR_MAX_FRAG];
-                     nat_log_notice
-                       ("maximum fragments per reassembly exceeded");
-                     next0 = SNAT_OUT2IN_NEXT_DROP;
-                     goto trace0;
-                   }
-                 cached0 = 1;
-                 goto trace0;
-               }
-             s0 = pool_elt_at_index (per_thread_data->sessions,
-                                     reass0->sess_index);
-           }
-
-         old_addr0 = ip0->dst_address.as_u32;
-         ip0->dst_address = s0->in2out.addr;
-         new_addr0 = ip0->dst_address.as_u32;
-         vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
-
-         sum0 = ip0->checksum;
-         sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                ip4_header_t,
-                                dst_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->dst_port;
-                 tcp0->dst_port = s0->in2out.port;
-                 new_port0 = tcp0->dst_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->dst_port;
-                 udp0->dst_port = s0->in2out.port;
-                 udp0->checksum = 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_OUT2IN_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_out2in_reass_node.index,
-                              SNAT_OUT2IN_ERROR_OUT2IN_PACKETS,
-                              pkts_processed);
-
-  nat_send_all_to_node (vm, fragments_to_drop, node,
-                       &node->errors[SNAT_OUT2IN_ERROR_DROP_FRAGMENT],
-                       SNAT_OUT2IN_NEXT_DROP);
-
-  vec_free (fragments_to_drop);
-  vec_free (fragments_to_loopback);
-  return frame->n_vectors;
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (nat44_out2in_reass_node) = {
-  .function = nat44_out2in_reass_node_fn,
-  .name = "nat44-out2in-reass",
-  .vector_size = sizeof (u32),
-  .format_trace = format_nat44_reass_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(snat_out2in_error_strings),
-  .error_strings = snat_out2in_error_strings,
-
-  .n_next_nodes = SNAT_OUT2IN_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
-    [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
-    [SNAT_OUT2IN_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_OUT2IN_NEXT_REASS] = "nat44-out2in-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (nat44_out2in_reass_node,
-                             nat44_out2in_reass_node_fn);
-
-static uword
-snat_out2in_fast_node_fn (vlib_main_t * vm,
-                         vlib_node_runtime_t * node, vlib_frame_t * frame)
+VLIB_NODE_FN (snat_out2in_fast_node) (vlib_main_t * vm,
+                                     vlib_node_runtime_t * node,
+                                     vlib_frame_t * frame)
 {
   u32 n_left_from, *from, *to_next;
   snat_out2in_next_t next_index;
@@ -1730,26 +1503,30 @@ snat_out2in_fast_node_fn (vlib_main_t * vm,
 
          if (PREDICT_FALSE (new_port0 != udp0->dst_port))
            {
+             old_port0 = udp0->dst_port;
+             udp0->dst_port = new_port0;
+
              if (PREDICT_TRUE (proto0 == SNAT_PROTOCOL_TCP))
                {
-                 old_port0 = tcp0->dst_port;
-                 tcp0->dst_port = new_port0;
-
                  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
+             else if (udp0->checksum)
                {
-                 old_port0 = udp0->dst_port;
-                 udp0->dst_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
@@ -1760,9 +1537,16 @@ snat_out2in_fast_node_fn (vlib_main_t * vm,
                  sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
                                         ip4_header_t,
                                         dst_address /* changed member */ );
-
                  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);
+               }
            }
 
        trace00:
@@ -1787,7 +1571,7 @@ snat_out2in_fast_node_fn (vlib_main_t * vm,
       vlib_put_next_frame (vm, node, next_index, n_left_to_next);
     }
 
-  vlib_node_increment_counter (vm, snat_out2in_fast_node.index,
+  vlib_node_increment_counter (vm, sm->out2in_fast_node_index,
                               SNAT_OUT2IN_ERROR_OUT2IN_PACKETS,
                               pkts_processed);
   return frame->n_vectors;
@@ -1795,7 +1579,6 @@ snat_out2in_fast_node_fn (vlib_main_t * vm,
 
 /* *INDENT-OFF* */
 VLIB_REGISTER_NODE (snat_out2in_fast_node) = {
-  .function = snat_out2in_fast_node_fn,
   .name = "nat44-out2in-fast",
   .vector_size = sizeof (u32),
   .format_trace = format_snat_out2in_fast_trace,
@@ -1813,14 +1596,10 @@ VLIB_REGISTER_NODE (snat_out2in_fast_node) = {
     [SNAT_OUT2IN_NEXT_LOOKUP] = "ip4-lookup",
     [SNAT_OUT2IN_NEXT_DROP] = "error-drop",
     [SNAT_OUT2IN_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-    [SNAT_OUT2IN_NEXT_REASS] = "nat44-out2in-reass",
   },
 };
 /* *INDENT-ON* */
 
-VLIB_NODE_FUNCTION_MULTIARCH (snat_out2in_fast_node,
-                             snat_out2in_fast_node_fn);
-
 /*
  * fd.io coding-style-patch-verification: ON
  *