nat: nat44-ei hairpinning code cleanup
[vpp.git] / src / plugins / nat / nat44-ei / nat44_ei_in2out.c
index ad0007b..7506063 100644 (file)
  */
 /**
  * @file
- * @brief NAT44 inside to outside network translation
+ * @brief NAT44 EI inside to outside network translation
  */
 
 #include <vlib/vlib.h>
-#include <vnet/vnet.h>
 
+#include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
-#include <vnet/fib/ip4_fib.h>
 #include <vnet/udp/udp_local.h>
-#include <nat/nat.h>
-#include <nat/lib/ipfix_logging.h>
-#include <nat/nat_inlines.h>
-#include <nat/lib/nat_syslog.h>
-#include <nat/nat44-ei/nat44_ei_inlines.h>
-#include <nat/nat44-ei/nat44_ei.h>
+#include <vnet/fib/ip4_fib.h>
 
 #include <vppinfra/hash.h>
 #include <vppinfra/error.h>
-#include <vppinfra/elog.h>
+
+#include <nat/lib/log.h>
+#include <nat/lib/nat_syslog.h>
+#include <nat/lib/ipfix_logging.h>
 #include <nat/lib/nat_inlines.h>
+#include <nat/nat44-ei/nat44_ei_inlines.h>
+#include <nat/nat44-ei/nat44_ei.h>
+
+extern vnet_feature_arc_registration_t vnet_feat_arc_ip4_local;
+
+#define foreach_nat44_ei_in2out_error                                         \
+  _ (UNSUPPORTED_PROTOCOL, "unsupported protocol")                            \
+  _ (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")                      \
+  _ (CANNOT_CREATE_USER, "cannot create NAT user")
+
+#define foreach_nat44_ei_hairpinning_handoff_error                            \
+  _ (CONGESTION_DROP, "congestion drop")
+
+typedef enum
+{
+#define _(sym, str) NAT44_EI_IN2OUT_ERROR_##sym,
+  foreach_nat44_ei_in2out_error
+#undef _
+    NAT44_EI_IN2OUT_N_ERROR,
+} nat44_ei_in2out_error_t;
+
+static char *nat44_ei_in2out_error_strings[] = {
+#define _(sym,string) string,
+  foreach_nat44_ei_in2out_error
+#undef _
+};
+
+typedef enum
+{
+#define _(sym, str) NAT44_EI_HAIRPINNING_HANDOFF_ERROR_##sym,
+  foreach_nat44_ei_hairpinning_handoff_error
+#undef _
+    NAT44_EI_HAIRPINNING_HANDOFF_N_ERROR,
+} nat44_ei_hairpinning_handoff_error_t;
+
+static char *nat44_ei_hairpinning_handoff_error_strings[] = {
+#define _(sym, string) string,
+  foreach_nat44_ei_hairpinning_handoff_error
+#undef _
+};
+
+typedef enum
+{
+  NAT44_EI_IN2OUT_NEXT_LOOKUP,
+  NAT44_EI_IN2OUT_NEXT_DROP,
+  NAT44_EI_IN2OUT_NEXT_ICMP_ERROR,
+  NAT44_EI_IN2OUT_NEXT_SLOW_PATH,
+  NAT44_EI_IN2OUT_NEXT_HAIRPINNING_HANDOFF,
+  NAT44_EI_IN2OUT_N_NEXT,
+} nat44_ei_in2out_next_t;
+
+typedef enum
+{
+  NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_DROP,
+  NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_LOOKUP,
+  NAT44_EI_IN2OUT_HAIRPINNING_FINISH_N_NEXT,
+} nat44_ei_in2out_hairpinnig_finish_next_t;
+
+typedef enum
+{
+  NAT44_EI_HAIRPIN_NEXT_LOOKUP,
+  NAT44_EI_HAIRPIN_NEXT_DROP,
+  NAT44_EI_HAIRPIN_NEXT_HANDOFF,
+  NAT44_EI_HAIRPIN_N_NEXT,
+} nat44_ei_hairpin_next_t;
 
 typedef struct
 {
@@ -43,95 +109,161 @@ typedef struct
   u32 session_index;
   u32 is_slow_path;
   u32 is_hairpinning;
-} snat_in2out_trace_t;
+} nat44_ei_in2out_trace_t;
+
+typedef struct
+{
+  ip4_address_t addr;
+  u16 port;
+  u32 fib_index;
+  u32 session_index;
+} nat44_ei_hairpin_trace_t;
+
+typedef struct
+{
+  u32 next_worker_index;
+} nat44_ei_hairpinning_handoff_trace_t;
 
-/* packet trace format function */
 static u8 *
-format_snat_in2out_trace (u8 * s, va_list * args)
+format_nat44_ei_in2out_trace (u8 *s, va_list *args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_in2out_trace_t *t = va_arg (*args, snat_in2out_trace_t *);
+  nat44_ei_in2out_trace_t *t = va_arg (*args, nat44_ei_in2out_trace_t *);
   char *tag;
-
   tag = t->is_slow_path ? "NAT44_IN2OUT_SLOW_PATH" : "NAT44_IN2OUT_FAST_PATH";
-
   s = format (s, "%s: sw_if_index %d, next index %d, session %d", tag,
              t->sw_if_index, t->next_index, t->session_index);
   if (t->is_hairpinning)
+    s = format (s, ", with-hairpinning");
+  return s;
+}
+
+static u8 *
+format_nat44_ei_in2out_fast_trace (u8 *s, va_list *args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  nat44_ei_in2out_trace_t *t = va_arg (*args, nat44_ei_in2out_trace_t *);
+  s = format (s, "NAT44_IN2OUT_FAST: sw_if_index %d, next index %d",
+             t->sw_if_index, t->next_index);
+  return s;
+}
+
+static u8 *
+format_nat44_ei_hairpin_trace (u8 *s, va_list *args)
+{
+  CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
+  CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
+  nat44_ei_hairpin_trace_t *t = va_arg (*args, nat44_ei_hairpin_trace_t *);
+
+  s = format (s, "new dst addr %U port %u fib-index %u", format_ip4_address,
+             &t->addr, clib_net_to_host_u16 (t->port), t->fib_index);
+  if (~0 == t->session_index)
+    {
+      s = format (s, " is-static-mapping");
+    }
+  else
     {
-      s = format (s, ", with-hairpinning");
+      s = format (s, " session-index %u", t->session_index);
     }
 
   return s;
 }
 
 static u8 *
-format_snat_in2out_fast_trace (u8 * s, va_list * args)
+format_nat44_ei_hairpinning_handoff_trace (u8 *s, va_list *args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  snat_in2out_trace_t *t = va_arg (*args, snat_in2out_trace_t *);
+  nat44_ei_hairpinning_handoff_trace_t *t =
+    va_arg (*args, nat44_ei_hairpinning_handoff_trace_t *);
 
-  s = format (s, "NAT44_IN2OUT_FAST: sw_if_index %d, next index %d",
-             t->sw_if_index, t->next_index);
+  s = format (s, "nat44-ei-hairpinning-handoff: next-worker %d",
+             t->next_worker_index);
 
   return s;
 }
 
-#define foreach_snat_in2out_error                       \
-_(UNSUPPORTED_PROTOCOL, "unsupported protocol")         \
-_(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")   \
-_(CANNOT_CREATE_USER, "cannot create NAT user")
-
-typedef enum
+static_always_inline int
+nat44_ei_not_translate_fast (vlib_node_runtime_t *node, u32 sw_if_index0,
+                            ip4_header_t *ip0, u32 proto0, u32 rx_fib_index0)
 {
-#define _(sym,str) SNAT_IN2OUT_ERROR_##sym,
-  foreach_snat_in2out_error
-#undef _
-    SNAT_IN2OUT_N_ERROR,
-} snat_in2out_error_t;
+  nat44_ei_main_t *nm = &nat44_ei_main;
 
-static char *snat_in2out_error_strings[] = {
-#define _(sym,string) string,
-  foreach_snat_in2out_error
-#undef _
-};
+  if (nm->out2in_dpo)
+    return 0;
 
-typedef enum
-{
-  SNAT_IN2OUT_NEXT_LOOKUP,
-  SNAT_IN2OUT_NEXT_DROP,
-  SNAT_IN2OUT_NEXT_ICMP_ERROR,
-  SNAT_IN2OUT_NEXT_SLOW_PATH,
-  SNAT_IN2OUT_N_NEXT,
-} snat_in2out_next_t;
-
-static inline int
-snat_not_translate (snat_main_t * sm, vlib_node_runtime_t * node,
-                   u32 sw_if_index0, ip4_header_t * ip0, u32 proto0,
-                   u32 rx_fib_index0, u32 thread_index)
+  fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
+  nat44_ei_outside_fib_t *outside_fib;
+  fib_prefix_t pfx = {
+    .fp_proto = FIB_PROTOCOL_IP4,
+    .fp_len = 32,
+    .fp_addr = {
+               .ip4.as_u32 = ip0->dst_address.as_u32,
+               }
+    ,
+  };
+
+  /* Don't NAT packet aimed at the intfc address */
+  if (PREDICT_FALSE (nat44_ei_is_interface_addr (
+       nm->ip4_main, node, sw_if_index0, ip0->dst_address.as_u32)))
+    return 1;
+
+  fei = fib_table_lookup (rx_fib_index0, &pfx);
+  if (FIB_NODE_INDEX_INVALID != fei)
+    {
+      u32 sw_if_index = fib_entry_get_resolving_interface (fei);
+      if (sw_if_index == ~0)
+       {
+         vec_foreach (outside_fib, nm->outside_fibs)
+           {
+             fei = fib_table_lookup (outside_fib->fib_index, &pfx);
+             if (FIB_NODE_INDEX_INVALID != fei)
+               {
+                 sw_if_index = fib_entry_get_resolving_interface (fei);
+                 if (sw_if_index != ~0)
+                   break;
+               }
+           }
+       }
+      if (sw_if_index == ~0)
+       return 1;
+
+      nat44_ei_interface_t *i;
+      pool_foreach (i, nm->interfaces)
+       {
+         /* NAT packet aimed at outside interface */
+         if ((nat44_ei_interface_is_outside (i)) &&
+             (sw_if_index == i->sw_if_index))
+           return 0;
+       }
+    }
+
+  return 1;
+}
+
+static_always_inline int
+nat44_ei_not_translate (nat44_ei_main_t *nm, vlib_node_runtime_t *node,
+                       u32 sw_if_index0, ip4_header_t *ip0, u32 proto0,
+                       u32 rx_fib_index0, u32 thread_index)
 {
   udp_header_t *udp0 = ip4_next_header (ip0);
   clib_bihash_kv_8_8_t kv0, value0;
 
-  init_nat_k (&kv0, ip0->dst_address, udp0->dst_port, sm->outside_fib_index,
+  init_nat_k (&kv0, ip0->dst_address, udp0->dst_port, nm->outside_fib_index,
              proto0);
 
   /* NAT packet aimed at external address if */
   /* has active sessions */
-  if (clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
+  if (clib_bihash_search_8_8 (&nm->out2in, &kv0, &value0))
     {
       /* or is static mappings */
       ip4_address_t placeholder_addr;
       u16 placeholder_port;
       u32 placeholder_fib_index;
       if (!nat44_ei_static_mapping_match (ip0->dst_address, udp0->dst_port,
-                                         sm->outside_fib_index, proto0,
+                                         nm->outside_fib_index, proto0,
                                          &placeholder_addr, &placeholder_port,
                                          &placeholder_fib_index, 1, 0, 0))
        return 0;
@@ -139,41 +271,40 @@ snat_not_translate (snat_main_t * sm, vlib_node_runtime_t * node,
   else
     return 0;
 
-  if (sm->forwarding_enabled)
+  if (nm->forwarding_enabled)
     return 1;
 
-  return snat_not_translate_fast (sm, node, sw_if_index0, ip0, proto0,
-                                 rx_fib_index0);
+  return nat44_ei_not_translate_fast (node, sw_if_index0, ip0, proto0,
+                                     rx_fib_index0);
 }
 
-static inline int
-nat_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip0,
-                                 u32 proto0, u16 src_port, u16 dst_port,
-                                 u32 thread_index, u32 sw_if_index)
+static_always_inline int
+nat44_ei_not_translate_output_feature (nat44_ei_main_t *nm, ip4_header_t *ip0,
+                                      u32 proto0, u16 src_port, u16 dst_port,
+                                      u32 thread_index, u32 sw_if_index)
 {
   clib_bihash_kv_8_8_t kv0, value0;
-  snat_interface_t *i;
+  nat44_ei_interface_t *i;
 
   /* src NAT check */
   init_nat_k (&kv0, ip0->src_address, src_port,
              ip4_fib_table_get_index_for_sw_if_index (sw_if_index), proto0);
 
-  if (!clib_bihash_search_8_8 (&sm->out2in, &kv0, &value0))
+  if (!clib_bihash_search_8_8 (&nm->out2in, &kv0, &value0))
     return 1;
 
   /* dst NAT check */
   init_nat_k (&kv0, ip0->dst_address, dst_port,
              ip4_fib_table_get_index_for_sw_if_index (sw_if_index), proto0);
-  if (!clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
+  if (!clib_bihash_search_8_8 (&nm->in2out, &kv0, &value0))
     {
       /* hairpinning */
-    /* *INDENT-OFF* */
-    pool_foreach (i, sm->output_feature_interfaces)
-     {
-      if ((nat_interface_is_inside(i)) && (sw_if_index == i->sw_if_index))
-        return 0;
-    }
-    /* *INDENT-ON* */
+      pool_foreach (i, nm->output_feature_interfaces)
+       {
+         if ((nat44_ei_interface_is_inside (i)) &&
+             (sw_if_index == i->sw_if_index))
+           return 0;
+       }
       return 1;
     }
 
@@ -184,29 +315,32 @@ nat_not_translate_output_feature (snat_main_t * sm, ip4_header_t * ip0,
 int
 nat44_i2o_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
 {
-  snat_main_t *sm = &snat_main;
-  nat44_is_idle_session_ctx_t *ctx = arg;
-  snat_session_t *s;
+  nat44_ei_main_t *nm = &nat44_ei_main;
+  nat44_ei_is_idle_session_ctx_t *ctx = arg;
+  nat44_ei_session_t *s;
   u64 sess_timeout_time;
-  snat_main_per_thread_data_t *tsm = vec_elt_at_index (sm->per_thread_data,
-                                                      ctx->thread_index);
+  nat44_ei_main_per_thread_data_t *tnm =
+    vec_elt_at_index (nm->per_thread_data, ctx->thread_index);
   clib_bihash_kv_8_8_t s_kv;
 
-  s = pool_elt_at_index (tsm->sessions, kv->value);
-  sess_timeout_time = s->last_heard + (f64) nat44_session_get_timeout (sm, s);
+  if (ctx->thread_index != nat_value_get_thread_index (kv))
+    {
+      return 0;
+    }
+
+  s = pool_elt_at_index (tnm->sessions, nat_value_get_session_index (kv));
+  sess_timeout_time = s->last_heard + (f64) nat_session_get_timeout (
+                                       &nm->timeouts, s->nat_proto, s->state);
   if (ctx->now >= sess_timeout_time)
     {
       init_nat_o2i_k (&s_kv, s);
-      if (clib_bihash_add_del_8_8 (&sm->out2in, &s_kv, 0))
-       nat_elog_warn ("out2in key del failed");
+      if (clib_bihash_add_del_8_8 (&nm->out2in, &s_kv, 0))
+       nat_elog_warn (nm, "out2in key del failed");
 
-      nat_ipfix_logging_nat44_ses_delete (ctx->thread_index,
-                                         s->in2out.addr.as_u32,
-                                         s->out2in.addr.as_u32,
-                                         s->nat_proto,
-                                         s->in2out.port,
-                                         s->out2in.port,
-                                         s->in2out.fib_index);
+      nat_ipfix_logging_nat44_ses_delete (
+       ctx->thread_index, s->in2out.addr.as_u32, s->out2in.addr.as_u32,
+       nat_proto_to_ip_proto (s->nat_proto), 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,
@@ -216,12 +350,12 @@ nat44_i2o_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
                   s->ext_host_port, s->nat_proto, 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.addr,
-                                           s->out2in.port, s->nat_proto);
+      if (!nat44_ei_is_session_static (s))
+       nat44_ei_free_outside_address_and_port (
+         nm->addresses, ctx->thread_index, &s->out2in.addr, s->out2in.port,
+         s->nat_proto);
 
-      nat44_delete_session (sm, s, ctx->thread_index);
+      nat44_ei_delete_session (nm, s, ctx->thread_index);
       return 1;
     }
 
@@ -230,20 +364,16 @@ nat44_i2o_is_idle_session_cb (clib_bihash_kv_8_8_t * kv, void *arg)
 #endif
 
 static u32
-slow_path (snat_main_t * sm, vlib_buffer_t * b0,
-          ip4_header_t * ip0,
-          ip4_address_t i2o_addr,
-          u16 i2o_port,
-          u32 rx_fib_index0,
-          nat_protocol_t nat_proto,
-          snat_session_t ** sessionp,
-          vlib_node_runtime_t * node, u32 next0, u32 thread_index, f64 now)
+slow_path (nat44_ei_main_t *nm, vlib_buffer_t *b0, ip4_header_t *ip0,
+          ip4_address_t i2o_addr, u16 i2o_port, u32 rx_fib_index0,
+          nat_protocol_t nat_proto, nat44_ei_session_t **sessionp,
+          vlib_node_runtime_t *node, u32 next0, u32 thread_index, f64 now)
 {
-  snat_user_t *u;
-  snat_session_t *s = 0;
+  nat44_ei_user_t *u;
+  nat44_ei_session_t *s = 0;
   clib_bihash_kv_8_8_t kv0;
   u8 is_sm = 0;
-  nat_outside_fib_t *outside_fib;
+  nat44_ei_outside_fib_t *outside_fib;
   fib_node_index_t fei = FIB_NODE_INDEX_INVALID;
   u8 identity_nat;
   fib_prefix_t pfx = {
@@ -253,18 +383,18 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
                .ip4.as_u32 = ip0->dst_address.as_u32,
                },
   };
-  nat44_is_idle_session_ctx_t ctx0;
+  nat44_ei_is_idle_session_ctx_t ctx0;
   ip4_address_t sm_addr;
   u16 sm_port;
   u32 sm_fib_index;
 
-  if (PREDICT_FALSE (nat44_ei_maximum_sessions_exceeded (sm, thread_index)))
+  if (PREDICT_FALSE (nat44_ei_maximum_sessions_exceeded (nm, thread_index)))
     {
-      b0->error = node->errors[SNAT_IN2OUT_ERROR_MAX_SESSIONS_EXCEEDED];
+      b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_MAX_SESSIONS_EXCEEDED];
       nat_ipfix_logging_max_sessions (thread_index,
-                                     sm->max_translations_per_thread);
-      nat_elog_notice ("maximum sessions exceeded");
-      return SNAT_IN2OUT_NEXT_DROP;
+                                     nm->max_translations_per_thread);
+      nat_elog_notice (nm, "maximum sessions exceeded");
+      return NAT44_EI_IN2OUT_NEXT_DROP;
     }
 
   /* First try to match static mapping by local address and port */
@@ -273,13 +403,13 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
                                     &sm_fib_index, 0, 0, &identity_nat))
     {
       /* Try to create dynamic translation */
-      if (sm->alloc_addr_and_port (
-           sm->addresses, rx_fib_index0, thread_index, nat_proto, &sm_addr,
-           &sm_port, sm->port_per_thread,
-           sm->per_thread_data[thread_index].snat_thread_index))
+      if (nm->alloc_addr_and_port (
+           nm->addresses, rx_fib_index0, thread_index, nat_proto,
+           ip0->src_address, &sm_addr, &sm_port, nm->port_per_thread,
+           nm->per_thread_data[thread_index].snat_thread_index))
        {
-         b0->error = node->errors[SNAT_IN2OUT_ERROR_OUT_OF_PORTS];
-         return SNAT_IN2OUT_NEXT_DROP;
+         b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_OUT_OF_PORTS];
+         return NAT44_EI_IN2OUT_NEXT_DROP;
        }
     }
   else
@@ -293,55 +423,53 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
       is_sm = 1;
     }
 
-  u = nat_user_get_or_create (sm, &ip0->src_address, rx_fib_index0,
-                             thread_index);
+  u = nat44_ei_user_get_or_create (nm, &ip0->src_address, rx_fib_index0,
+                                  thread_index);
   if (!u)
     {
-      b0->error = node->errors[SNAT_IN2OUT_ERROR_CANNOT_CREATE_USER];
-      return SNAT_IN2OUT_NEXT_DROP;
+      b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_CANNOT_CREATE_USER];
+      return NAT44_EI_IN2OUT_NEXT_DROP;
     }
 
-  s = nat_session_alloc_or_recycle (sm, u, thread_index, now);
+  s = nat44_ei_session_alloc_or_recycle (nm, u, thread_index, now);
   if (!s)
     {
-      nat44_delete_user_with_no_session (sm, u, thread_index);
-      nat_elog_warn ("create NAT session failed");
-      return SNAT_IN2OUT_NEXT_DROP;
+      nat44_ei_delete_user_with_no_session (nm, u, thread_index);
+      nat_elog_warn (nm, "create NAT session failed");
+      return NAT44_EI_IN2OUT_NEXT_DROP;
     }
 
   if (is_sm)
-    s->flags |= SNAT_SESSION_FLAG_STATIC_MAPPING;
-  user_session_increment (sm, u, is_sm);
+    s->flags |= NAT44_EI_SESSION_FLAG_STATIC_MAPPING;
+  nat44_ei_user_session_increment (nm, u, is_sm);
   s->in2out.addr = i2o_addr;
   s->in2out.port = i2o_port;
   s->in2out.fib_index = rx_fib_index0;
   s->nat_proto = nat_proto;
   s->out2in.addr = sm_addr;
   s->out2in.port = sm_port;
-  s->out2in.fib_index = sm->outside_fib_index;
-  switch (vec_len (sm->outside_fibs))
+  s->out2in.fib_index = nm->outside_fib_index;
+  switch (vec_len (nm->outside_fibs))
     {
     case 0:
-      s->out2in.fib_index = sm->outside_fib_index;
+      s->out2in.fib_index = nm->outside_fib_index;
       break;
     case 1:
-      s->out2in.fib_index = sm->outside_fibs[0].fib_index;
+      s->out2in.fib_index = nm->outside_fibs[0].fib_index;
       break;
     default:
-      /* *INDENT-OFF* */
-      vec_foreach (outside_fib, sm->outside_fibs)
-        {
-          fei = fib_table_lookup (outside_fib->fib_index, &pfx);
-          if (FIB_NODE_INDEX_INVALID != fei)
-            {
-              if (fib_entry_get_resolving_interface (fei) != ~0)
-                {
-                  s->out2in.fib_index = outside_fib->fib_index;
-                  break;
-                }
-            }
-        }
-      /* *INDENT-ON* */
+      vec_foreach (outside_fib, nm->outside_fibs)
+       {
+         fei = fib_table_lookup (outside_fib->fib_index, &pfx);
+         if (FIB_NODE_INDEX_INVALID != fei)
+           {
+             if (fib_entry_get_resolving_interface (fei) != ~0)
+               {
+                 s->out2in.fib_index = outside_fib->fib_index;
+                 break;
+               }
+           }
+       }
       break;
     }
   s->ext_host_addr.as_u32 = ip0->dst_address.as_u32;
@@ -352,41 +480,38 @@ slow_path (snat_main_t * sm, vlib_buffer_t * b0,
   ctx0.now = now;
   ctx0.thread_index = thread_index;
   init_nat_i2o_kv (&kv0, s, thread_index,
-                  s - sm->per_thread_data[thread_index].sessions);
+                  s - nm->per_thread_data[thread_index].sessions);
   if (clib_bihash_add_or_overwrite_stale_8_8 (
-       &sm->in2out, &kv0, nat44_i2o_is_idle_session_cb, &ctx0))
-    nat_elog_notice ("in2out key add failed");
+       &nm->in2out, &kv0, nat44_i2o_is_idle_session_cb, &ctx0))
+    nat_elog_notice (nm, "in2out key add failed");
 
   init_nat_o2i_kv (&kv0, s, thread_index,
-                  s - sm->per_thread_data[thread_index].sessions);
+                  s - nm->per_thread_data[thread_index].sessions);
   if (clib_bihash_add_or_overwrite_stale_8_8 (
-       &sm->out2in, &kv0, nat44_o2i_is_idle_session_cb, &ctx0))
-    nat_elog_notice ("out2in key add failed");
+       &nm->out2in, &kv0, nat44_o2i_is_idle_session_cb, &ctx0))
+    nat_elog_notice (nm, "out2in key add failed");
 
   /* log NAT event */
-  nat_ipfix_logging_nat44_ses_create (thread_index,
-                                     s->in2out.addr.as_u32,
-                                     s->out2in.addr.as_u32,
-                                     s->nat_proto,
-                                     s->in2out.port,
-                                     s->out2in.port, s->in2out.fib_index);
+  nat_ipfix_logging_nat44_ses_create (
+    thread_index, s->in2out.addr.as_u32, s->out2in.addr.as_u32,
+    nat_proto_to_ip_proto (s->nat_proto), 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->nat_proto);
+  nat_syslog_nat44_apmadd (s->user_index, s->in2out.fib_index, &s->in2out.addr,
+                          s->in2out.port, &s->out2in.addr, s->out2in.port,
+                          s->nat_proto);
 
   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->nat_proto, s->in2out.fib_index, s->flags, thread_index, 0);
+              &s->ext_host_nat_addr, s->ext_host_nat_port, s->nat_proto,
+              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 (vlib_buffer_t * b, ip4_header_t * ip0,
-             ip4_address_t * addr, u16 * port, nat_protocol_t * nat_proto)
+static_always_inline nat44_ei_in2out_error_t
+icmp_get_key (vlib_buffer_t *b, ip4_header_t *ip0, ip4_address_t *addr,
+             u16 *port, nat_protocol_t *nat_proto)
 {
   icmp46_header_t *icmp0;
   icmp_echo_header_t *echo0, *inner_echo0 = 0;
@@ -422,37 +547,23 @@ icmp_get_key (vlib_buffer_t * b, ip4_header_t * ip0,
          *port = ((tcp_udp_header_t *) l4_header)->dst_port;
          break;
        default:
-         return SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL;
+         return NAT44_EI_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL;
        }
     }
   return -1;                   /* success */
 }
 
-/**
- * Get address and port values to be used for ICMP packet translation
- * and create session if needed
- *
- * @param[in,out] sm             NAT main
- * @param[in,out] node           NAT node runtime
- * @param[in] thread_index       thread index
- * @param[in,out] b0             buffer containing packet to be translated
- * @param[in,out] ip0            ip header
- * @param[out] p_proto           protocol used for matching
- * @param[out] p_value           address and port after NAT translation
- * @param[out] p_dont_translate  if packet should not be translated
- * @param d                      optional parameter
- * @param e                      optional parameter
- */
-u32
-icmp_match_in2out_slow (snat_main_t *sm, vlib_node_runtime_t *node,
-                       u32 thread_index, vlib_buffer_t *b0, ip4_header_t *ip0,
-                       ip4_address_t *addr, u16 *port, u32 *fib_index,
-                       nat_protocol_t *proto, snat_session_t **p_s0,
-                       u8 *dont_translate)
+static_always_inline u32
+nat44_ei_icmp_match_in2out_slow (vlib_node_runtime_t *node, u32 thread_index,
+                                vlib_buffer_t *b0, ip4_header_t *ip0,
+                                ip4_address_t *addr, u16 *port,
+                                u32 *fib_index, nat_protocol_t *proto,
+                                nat44_ei_session_t **p_s0, u8 *dont_translate)
 {
-  snat_main_per_thread_data_t *tsm = &sm->per_thread_data[thread_index];
+  nat44_ei_main_t *nm = &nat44_ei_main;
+  nat44_ei_main_per_thread_data_t *tnm = &nm->per_thread_data[thread_index];
   u32 sw_if_index0;
-  snat_session_t *s0 = 0;
+  nat44_ei_session_t *s0 = 0;
   clib_bihash_kv_8_8_t kv0, value0;
   u32 next0 = ~0;
   int err;
@@ -466,18 +577,17 @@ icmp_match_in2out_slow (snat_main_t *sm, vlib_node_runtime_t *node,
   if (err != -1)
     {
       b0->error = node->errors[err];
-      next0 = SNAT_IN2OUT_NEXT_DROP;
+      next0 = NAT44_EI_IN2OUT_NEXT_DROP;
       goto out;
     }
 
   init_nat_k (&kv0, *addr, *port, *fib_index, *proto);
-  if (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
+  if (clib_bihash_search_8_8 (&nm->in2out, &kv0, &value0))
     {
       if (vnet_buffer (b0)->sw_if_index[VLIB_TX] != ~0)
        {
-         if (PREDICT_FALSE
-             (nat_not_translate_output_feature
-              (sm, ip0, *proto, *port, *port, thread_index, sw_if_index0)))
+         if (PREDICT_FALSE (nat44_ei_not_translate_output_feature (
+               nm, ip0, *proto, *port, *port, thread_index, sw_if_index0)))
            {
              *dont_translate = 1;
              goto out;
@@ -485,9 +595,9 @@ icmp_match_in2out_slow (snat_main_t *sm, vlib_node_runtime_t *node,
        }
       else
        {
-         if (PREDICT_FALSE (snat_not_translate (sm, node, sw_if_index0,
-                                                ip0, NAT_PROTOCOL_ICMP,
-                                                *fib_index, thread_index)))
+         if (PREDICT_FALSE (nat44_ei_not_translate (
+               nm, node, sw_if_index0, ip0, NAT_PROTOCOL_ICMP, *fib_index,
+               thread_index)))
            {
              *dont_translate = 1;
              goto out;
@@ -498,16 +608,15 @@ icmp_match_in2out_slow (snat_main_t *sm, vlib_node_runtime_t *node,
          (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;
+         b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_BAD_ICMP_TYPE];
+         next0 = NAT44_EI_IN2OUT_NEXT_DROP;
          goto out;
        }
 
-      next0 =
-       slow_path (sm, b0, ip0, *addr, *port, *fib_index, *proto, &s0, node,
-                  next0, thread_index, vlib_time_now (vm));
+      next0 = slow_path (nm, b0, ip0, *addr, *port, *fib_index, *proto, &s0,
+                        node, next0, thread_index, vlib_time_now (vm));
 
-      if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
+      if (PREDICT_FALSE (next0 == NAT44_EI_IN2OUT_NEXT_DROP))
        goto out;
 
       if (!s0)
@@ -526,12 +635,12 @@ icmp_match_in2out_slow (snat_main_t *sm, vlib_node_runtime_t *node,
           && !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;
+         b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_BAD_ICMP_TYPE];
+         next0 = NAT44_EI_IN2OUT_NEXT_DROP;
          goto out;
        }
 
-      s0 = pool_elt_at_index (tsm->sessions,
+      s0 = pool_elt_at_index (tnm->sessions,
                              nat_value_get_session_index (&value0));
     }
 
@@ -546,29 +655,13 @@ out:
     *p_s0 = s0;
   return next0;
 }
-#endif
 
-#ifndef CLIB_MARCH_VARIANT
-/**
- * Get address and port values to be used for ICMP packet translation
- *
- * @param[in] sm                 NAT main
- * @param[in,out] node           NAT node runtime
- * @param[in] thread_index       thread index
- * @param[in,out] b0             buffer containing packet to be translated
- * @param[in,out] ip0            ip header
- * @param[out] p_proto           protocol used for matching
- * @param[out] p_value           address and port after NAT translation
- * @param[out] p_dont_translate  if packet should not be translated
- * @param d                      optional parameter
- * @param e                      optional parameter
- */
-u32
-icmp_match_in2out_fast (snat_main_t *sm, vlib_node_runtime_t *node,
-                       u32 thread_index, vlib_buffer_t *b0, ip4_header_t *ip0,
-                       ip4_address_t *addr, u16 *port, u32 *fib_index,
-                       nat_protocol_t *proto, snat_session_t **s0,
-                       u8 *dont_translate)
+static_always_inline u32
+nat44_ei_icmp_match_in2out_fast (vlib_node_runtime_t *node, u32 thread_index,
+                                vlib_buffer_t *b0, ip4_header_t *ip0,
+                                ip4_address_t *addr, u16 *port,
+                                u32 *fib_index, nat_protocol_t *proto,
+                                nat44_ei_session_t **s0, u8 *dont_translate)
 {
   u32 sw_if_index0;
   u8 is_addr_only;
@@ -583,7 +676,7 @@ icmp_match_in2out_fast (snat_main_t *sm, vlib_node_runtime_t *node,
   if (err != -1)
     {
       b0->error = node->errors[err];
-      next0 = SNAT_IN2OUT_NEXT_DROP;
+      next0 = NAT44_EI_IN2OUT_NEXT_DROP;
       goto out;
     }
 
@@ -595,9 +688,8 @@ icmp_match_in2out_fast (snat_main_t *sm, vlib_node_runtime_t *node,
                                     &sm_addr, &sm_port, &sm_fib_index, 0,
                                     &is_addr_only, 0))
     {
-      if (PREDICT_FALSE (snat_not_translate_fast (sm, node, sw_if_index0, ip0,
-                                                 IP_PROTOCOL_ICMP,
-                                                 *fib_index)))
+      if (PREDICT_FALSE (nat44_ei_not_translate_fast (
+           node, sw_if_index0, ip0, IP_PROTOCOL_ICMP, *fib_index)))
        {
          *dont_translate = 1;
          goto out;
@@ -606,12 +698,12 @@ icmp_match_in2out_fast (snat_main_t *sm, vlib_node_runtime_t *node,
       if (icmp_type_is_error_message
          (vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags))
        {
-         next0 = SNAT_IN2OUT_NEXT_DROP;
+         next0 = NAT44_EI_IN2OUT_NEXT_DROP;
          goto out;
        }
 
-      b0->error = node->errors[SNAT_IN2OUT_ERROR_NO_TRANSLATION];
-      next0 = SNAT_IN2OUT_NEXT_DROP;
+      b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_NO_TRANSLATION];
+      next0 = NAT44_EI_IN2OUT_NEXT_DROP;
       goto out;
     }
 
@@ -622,33 +714,154 @@ icmp_match_in2out_fast (snat_main_t *sm, vlib_node_runtime_t *node,
        && !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;
+      b0->error = node->errors[NAT44_EI_IN2OUT_ERROR_BAD_ICMP_TYPE];
+      next0 = NAT44_EI_IN2OUT_NEXT_DROP;
       goto out;
     }
 
 out:
   return next0;
 }
-#endif
 
-u32 icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
-                icmp46_header_t *icmp0, u32 sw_if_index0, u32 rx_fib_index0,
-                vlib_node_runtime_t *node, u32 next0, u32 thread_index,
-                snat_session_t **p_s0);
+static_always_inline u32
+nat44_ei_icmp_hairpinning (nat44_ei_main_t *nm, vlib_buffer_t *b0,
+                          u32 thread_index, ip4_header_t *ip0,
+                          icmp46_header_t *icmp0, u32 *required_thread_index)
+{
+  clib_bihash_kv_8_8_t kv0, value0;
+  u32 old_dst_addr0, new_dst_addr0;
+  u32 old_addr0, new_addr0;
+  u16 old_port0, new_port0;
+  u16 old_checksum0, new_checksum0;
+  u32 si, ti = 0;
+  ip_csum_t sum0;
+  nat44_ei_session_t *s0;
+  nat44_ei_static_mapping_t *m0;
+
+  if (icmp_type_is_error_message (
+       vnet_buffer (b0)->ip.reass.icmp_type_or_tcp_flags))
+    {
+      ip4_header_t *inner_ip0 = 0;
+      tcp_udp_header_t *l4_header = 0;
 
-#ifndef CLIB_MARCH_VARIANT
-u32
-icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
-            icmp46_header_t *icmp0, u32 sw_if_index0, u32 rx_fib_index0,
-            vlib_node_runtime_t *node, u32 next0, u32 thread_index,
-            snat_session_t **p_s0)
+      inner_ip0 = (ip4_header_t *) ((icmp_echo_header_t *) (icmp0 + 1) + 1);
+      l4_header = ip4_next_header (inner_ip0);
+      u32 protocol = ip_proto_to_nat_proto (inner_ip0->protocol);
+
+      if (protocol != NAT_PROTOCOL_TCP && protocol != NAT_PROTOCOL_UDP)
+       return 1;
+
+      init_nat_k (&kv0, ip0->dst_address, l4_header->src_port,
+                 nm->outside_fib_index, protocol);
+      if (clib_bihash_search_8_8 (&nm->out2in, &kv0, &value0))
+       return 1;
+      ti = nat_value_get_thread_index (&value0);
+      if (ti != thread_index)
+       {
+         *required_thread_index = ti;
+         return 1;
+       }
+      si = nat_value_get_session_index (&value0);
+      s0 = pool_elt_at_index (nm->per_thread_data[ti].sessions, si);
+      new_dst_addr0 = s0->in2out.addr.as_u32;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+
+      /* update inner source IP address */
+      old_addr0 = inner_ip0->src_address.as_u32;
+      inner_ip0->src_address.as_u32 = new_dst_addr0;
+      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);
+      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, src_address);
+      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);
+
+      /* update inner source port */
+      old_port0 = l4_header->src_port;
+      l4_header->src_port = s0->in2out.port;
+      new_port0 = l4_header->src_port;
+      sum0 = icmp0->checksum;
+      sum0 = ip_csum_update (sum0, old_port0, new_port0, tcp_udp_header_t,
+                            src_port);
+      icmp0->checksum = ip_csum_fold (sum0);
+    }
+  else
+    {
+      init_nat_k (&kv0, ip0->dst_address, 0, nm->outside_fib_index, 0);
+      if (clib_bihash_search_8_8 (&nm->static_mapping_by_external, &kv0,
+                                 &value0))
+       {
+         icmp_echo_header_t *echo0 = (icmp_echo_header_t *) (icmp0 + 1);
+         u16 icmp_id0 = echo0->identifier;
+         init_nat_k (&kv0, ip0->dst_address, icmp_id0, nm->outside_fib_index,
+                     NAT_PROTOCOL_ICMP);
+         int rv = clib_bihash_search_8_8 (&nm->out2in, &kv0, &value0);
+         if (!rv)
+           {
+             ti = nat_value_get_thread_index (&value0);
+             if (ti != thread_index)
+               {
+                 *required_thread_index = ti;
+                 return 1;
+               }
+             si = nat_value_get_session_index (&value0);
+             s0 = pool_elt_at_index (nm->per_thread_data[ti].sessions, si);
+             new_dst_addr0 = s0->in2out.addr.as_u32;
+             vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+             echo0->identifier = s0->in2out.port;
+             sum0 = icmp0->checksum;
+             sum0 = ip_csum_update (sum0, icmp_id0, s0->in2out.port,
+                                    icmp_echo_header_t, identifier);
+             icmp0->checksum = ip_csum_fold (sum0);
+             goto change_addr;
+           }
+
+         return 1;
+       }
+
+      m0 = pool_elt_at_index (nm->static_mappings, value0.value);
+
+      new_dst_addr0 = m0->local_addr.as_u32;
+      if (vnet_buffer (b0)->sw_if_index[VLIB_TX] == ~0)
+       vnet_buffer (b0)->sw_if_index[VLIB_TX] = m0->fib_index;
+    }
+change_addr:
+  /* Destination is behind the same NAT, use internal address and port */
+  if (new_dst_addr0)
+    {
+      old_dst_addr0 = ip0->dst_address.as_u32;
+      ip0->dst_address.as_u32 = new_dst_addr0;
+      sum0 = ip0->checksum;
+      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0, ip4_header_t,
+                            dst_address);
+      ip0->checksum = ip_csum_fold (sum0);
+    }
+  return 0;
+}
+
+static_always_inline u32
+nat44_ei_icmp_in2out (vlib_buffer_t *b0, ip4_header_t *ip0,
+                     icmp46_header_t *icmp0, u32 sw_if_index0,
+                     u32 rx_fib_index0, vlib_node_runtime_t *node, u32 next0,
+                     u32 thread_index, nat44_ei_session_t **p_s0)
 {
+  nat44_ei_main_t *nm = &nat44_ei_main;
   vlib_main_t *vm = vlib_get_main ();
   ip4_address_t addr;
   u16 port;
   u32 fib_index;
-  nat_protocol_t protocol;
+  nat_protocol_t proto;
   icmp_echo_header_t *echo0, *inner_echo0 = 0;
   ip4_header_t *inner_ip0;
   void *l4_header = 0;
@@ -660,15 +873,26 @@ icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
   ip_csum_t sum0;
   u16 checksum0;
   u32 next0_tmp;
+  u32 required_thread_index = thread_index;
 
   echo0 = (icmp_echo_header_t *) (icmp0 + 1);
 
-  next0_tmp =
-    sm->icmp_match_in2out_cb (sm, node, thread_index, b0, ip0, &addr, &port,
-                             &fib_index, &protocol, p_s0, &dont_translate);
+  if (PREDICT_TRUE (nm->pat))
+    {
+      next0_tmp = nat44_ei_icmp_match_in2out_slow (
+       node, thread_index, b0, ip0, &addr, &port, &fib_index, &proto, p_s0,
+       &dont_translate);
+    }
+  else
+    {
+      next0_tmp = nat44_ei_icmp_match_in2out_fast (
+       node, thread_index, b0, ip0, &addr, &port, &fib_index, &proto, p_s0,
+       &dont_translate);
+    }
+
   if (next0_tmp != ~0)
     next0 = next0_tmp;
-  if (next0 == SNAT_IN2OUT_NEXT_DROP || dont_translate)
+  if (next0 == NAT44_EI_IN2OUT_NEXT_DROP || dont_translate)
     goto out;
 
   if (PREDICT_TRUE (!ip4_is_fragment (ip0)))
@@ -682,7 +906,7 @@ icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
       checksum0 = ~ip_csum_fold (sum0);
       if (PREDICT_FALSE (checksum0 != 0 && checksum0 != 0xffff))
        {
-         next0 = SNAT_IN2OUT_NEXT_DROP;
+         next0 = NAT44_EI_IN2OUT_NEXT_DROP;
          goto out;
        }
     }
@@ -723,7 +947,7 @@ icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
 
          if (!ip4_header_checksum_is_valid (inner_ip0))
            {
-             next0 = SNAT_IN2OUT_NEXT_DROP;
+             next0 = NAT44_EI_IN2OUT_NEXT_DROP;
              goto out;
            }
 
@@ -749,7 +973,7 @@ icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
                            checksum);
          icmp0->checksum = ip_csum_fold (sum0);
 
-         switch (protocol)
+         switch (proto)
            {
            case NAT_PROTOCOL_ICMP:
              inner_icmp0 = (icmp46_header_t *) l4_header;
@@ -784,57 +1008,82 @@ icmp_in2out (snat_main_t *sm, vlib_buffer_t *b0, ip4_header_t *ip0,
 
   if (vnet_buffer (b0)->sw_if_index[VLIB_TX] == ~0)
     {
-      if (0 != snat_icmp_hairpinning (sm, b0, ip0, icmp0))
+      if (0 != nat44_ei_icmp_hairpinning (nm, b0, thread_index, ip0, icmp0,
+                                         &required_thread_index))
        vnet_buffer (b0)->sw_if_index[VLIB_TX] = fib_index;
+      if (thread_index != required_thread_index)
+       {
+         vnet_buffer (b0)->snat.required_thread_index = required_thread_index;
+         next0 = NAT44_EI_IN2OUT_NEXT_HAIRPINNING_HANDOFF;
+       }
     }
 
 out:
   return next0;
 }
-#endif
 
-static inline u32
-icmp_in2out_slow_path (snat_main_t * sm,
-                      vlib_buffer_t * b0,
-                      ip4_header_t * ip0,
-                      icmp46_header_t * icmp0,
-                      u32 sw_if_index0,
-                      u32 rx_fib_index0,
-                      vlib_node_runtime_t * node,
-                      u32 next0,
-                      f64 now, u32 thread_index, snat_session_t ** p_s0)
+static_always_inline u32
+nat44_ei_icmp_in2out_slow_path (nat44_ei_main_t *nm, vlib_buffer_t *b0,
+                               ip4_header_t *ip0, icmp46_header_t *icmp0,
+                               u32 sw_if_index0, u32 rx_fib_index0,
+                               vlib_node_runtime_t *node, u32 next0, f64 now,
+                               u32 thread_index, nat44_ei_session_t **p_s0)
 {
   vlib_main_t *vm = vlib_get_main ();
 
-  next0 = icmp_in2out (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
-                      next0, thread_index, p_s0);
-  snat_session_t *s0 = *p_s0;
-  if (PREDICT_TRUE (next0 != SNAT_IN2OUT_NEXT_DROP && s0))
+  next0 = nat44_ei_icmp_in2out (b0, ip0, icmp0, sw_if_index0, rx_fib_index0,
+                               node, next0, thread_index, p_s0);
+  nat44_ei_session_t *s0 = *p_s0;
+  if (PREDICT_TRUE (next0 != NAT44_EI_IN2OUT_NEXT_DROP && s0))
     {
       /* Accounting */
       nat44_ei_session_update_counters (
        s0, now, vlib_buffer_length_in_chain (vm, b0), thread_index);
       /* Per-user LRU list maintenance */
-      nat44_session_update_lru (sm, s0, thread_index);
+      nat44_ei_session_update_lru (nm, s0, thread_index);
     }
   return next0;
 }
 
+static_always_inline void
+nat44_ei_hairpinning_sm_unknown_proto (nat44_ei_main_t *nm, vlib_buffer_t *b,
+                                      ip4_header_t *ip)
+{
+  clib_bihash_kv_8_8_t kv, value;
+  nat44_ei_static_mapping_t *m;
+  u32 old_addr, new_addr;
+  ip_csum_t sum;
+
+  init_nat_k (&kv, ip->dst_address, 0, 0, 0);
+  if (clib_bihash_search_8_8 (&nm->static_mapping_by_external, &kv, &value))
+    return;
+
+  m = pool_elt_at_index (nm->static_mappings, value.value);
+
+  old_addr = ip->dst_address.as_u32;
+  new_addr = ip->dst_address.as_u32 = m->local_addr.as_u32;
+  sum = ip->checksum;
+  sum = ip_csum_update (sum, old_addr, new_addr, ip4_header_t, dst_address);
+  ip->checksum = ip_csum_fold (sum);
+
+  if (vnet_buffer (b)->sw_if_index[VLIB_TX] == ~0)
+    vnet_buffer (b)->sw_if_index[VLIB_TX] = m->fib_index;
+}
+
 static int
-nat_in2out_sm_unknown_proto (snat_main_t * sm,
-                            vlib_buffer_t * b,
-                            ip4_header_t * ip, u32 rx_fib_index)
+nat_in2out_sm_unknown_proto (nat44_ei_main_t *nm, vlib_buffer_t *b,
+                            ip4_header_t *ip, u32 rx_fib_index)
 {
   clib_bihash_kv_8_8_t kv, value;
-  snat_static_mapping_t *m;
+  nat44_ei_static_mapping_t *m;
   u32 old_addr, new_addr;
   ip_csum_t sum;
 
   init_nat_k (&kv, ip->src_address, 0, rx_fib_index, 0);
-  if (clib_bihash_search_8_8 (&sm->static_mapping_by_local, &kv, &value))
+  if (clib_bihash_search_8_8 (&nm->static_mapping_by_local, &kv, &value))
     return 1;
 
-  m = pool_elt_at_index (sm->static_mappings, value.value);
+  m = pool_elt_at_index (nm->static_mappings, value.value);
 
   old_addr = ip->src_address.as_u32;
   new_addr = ip->src_address.as_u32 = m->external_addr.as_u32;
@@ -847,20 +1096,186 @@ nat_in2out_sm_unknown_proto (snat_main_t * sm,
   if (vnet_buffer (b)->sw_if_index[VLIB_TX] == ~0)
     {
       vnet_buffer (b)->sw_if_index[VLIB_TX] = m->fib_index;
-      nat_hairpinning_sm_unknown_proto (sm, b, ip);
+      nat44_ei_hairpinning_sm_unknown_proto (nm, b, ip);
     }
 
   return 0;
 }
 
-static inline uword
-snat_in2out_node_fn_inline (vlib_main_t * vm,
-                           vlib_node_runtime_t * node,
-                           vlib_frame_t * frame, int is_slow_path,
-                           int is_output_feature)
+static_always_inline int
+nat44_ei_hairpinning (vlib_main_t *vm, vlib_node_runtime_t *node,
+                     nat44_ei_main_t *nm, u32 thread_index, vlib_buffer_t *b0,
+                     ip4_header_t *ip0, udp_header_t *udp0,
+                     tcp_header_t *tcp0, u32 proto0, int do_trace,
+                     u32 *required_thread_index)
+{
+  nat44_ei_session_t *s0 = NULL;
+  clib_bihash_kv_8_8_t kv0, value0;
+  ip_csum_t sum0;
+  u32 new_dst_addr0 = 0, old_dst_addr0, si = ~0;
+  u16 new_dst_port0 = ~0, old_dst_port0;
+  int rv;
+  ip4_address_t sm0_addr;
+  u16 sm0_port;
+  u32 sm0_fib_index;
+  u32 old_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+
+  /* Check if destination is static mappings */
+  if (!nat44_ei_static_mapping_match (
+       ip0->dst_address, udp0->dst_port, nm->outside_fib_index, proto0,
+       &sm0_addr, &sm0_port, &sm0_fib_index, 1 /* by external */, 0, 0))
+    {
+      new_dst_addr0 = sm0_addr.as_u32;
+      new_dst_port0 = sm0_port;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = sm0_fib_index;
+    }
+  /* or active session */
+  else
+    {
+      init_nat_k (&kv0, ip0->dst_address, udp0->dst_port,
+                 nm->outside_fib_index, proto0);
+      rv = clib_bihash_search_8_8 (&nm->out2in, &kv0, &value0);
+      if (rv)
+       {
+         rv = 0;
+         goto trace;
+       }
+
+      if (thread_index != nat_value_get_thread_index (&value0))
+       {
+         *required_thread_index = nat_value_get_thread_index (&value0);
+         return 0;
+       }
+
+      si = nat_value_get_session_index (&value0);
+      s0 = pool_elt_at_index (nm->per_thread_data[thread_index].sessions, si);
+      new_dst_addr0 = s0->in2out.addr.as_u32;
+      new_dst_port0 = s0->in2out.port;
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] = s0->in2out.fib_index;
+    }
+
+  /* Check if anything has changed and if not, then return 0. This
+     helps avoid infinite loop, repeating the three nodes
+     nat44-hairpinning-->ip4-lookup-->ip4-local, in case nothing has
+     changed. */
+  old_dst_addr0 = ip0->dst_address.as_u32;
+  old_dst_port0 = tcp0->dst;
+  if (new_dst_addr0 == old_dst_addr0 && new_dst_port0 == old_dst_port0 &&
+      vnet_buffer (b0)->sw_if_index[VLIB_TX] == old_sw_if_index)
+    return 0;
+
+  /* Destination is behind the same NAT, use internal address and port */
+  if (new_dst_addr0)
+    {
+      old_dst_addr0 = ip0->dst_address.as_u32;
+      ip0->dst_address.as_u32 = new_dst_addr0;
+      sum0 = ip0->checksum;
+      sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0, ip4_header_t,
+                            dst_address);
+      ip0->checksum = ip_csum_fold (sum0);
+
+      old_dst_port0 = tcp0->dst;
+      if (PREDICT_TRUE (new_dst_port0 != old_dst_port0))
+       {
+         if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
+           {
+             tcp0->dst = new_dst_port0;
+             sum0 = tcp0->checksum;
+             sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
+                                    ip4_header_t, dst_address);
+             sum0 = ip_csum_update (sum0, old_dst_port0, new_dst_port0,
+                                    ip4_header_t /* cheat */, length);
+             tcp0->checksum = ip_csum_fold (sum0);
+           }
+         else
+           {
+             udp0->dst_port = new_dst_port0;
+             udp0->checksum = 0;
+           }
+       }
+      else
+       {
+         if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
+           {
+             sum0 = tcp0->checksum;
+             sum0 = ip_csum_update (sum0, old_dst_addr0, new_dst_addr0,
+                                    ip4_header_t, dst_address);
+             tcp0->checksum = ip_csum_fold (sum0);
+           }
+       }
+      rv = 1;
+      goto trace;
+    }
+  rv = 0;
+trace:
+  if (do_trace && PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+                                (b0->flags & VLIB_BUFFER_IS_TRACED)))
+    {
+      nat44_ei_hairpin_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+      t->addr.as_u32 = new_dst_addr0;
+      t->port = new_dst_port0;
+      t->fib_index = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      if (s0)
+       {
+         t->session_index = si;
+       }
+      else
+       {
+         t->session_index = ~0;
+       }
+    }
+  return rv;
+}
+
+static_always_inline uword
+nat44_ei_hairpinning_handoff_fn_inline (vlib_main_t *vm,
+                                       vlib_node_runtime_t *node,
+                                       vlib_frame_t *frame, u32 fq_index)
+{
+  vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
+  u32 n_enq, n_left_from, *from;
+  u16 thread_indices[VLIB_FRAME_SIZE], *ti;
+
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  vlib_get_buffers (vm, from, bufs, n_left_from);
+
+  b = bufs;
+  ti = thread_indices;
+
+  while (n_left_from > 0)
+    {
+      ti[0] = vnet_buffer (b[0])->snat.required_thread_index;
+
+      if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+                        (b[0]->flags & VLIB_BUFFER_IS_TRACED)))
+       {
+         nat44_ei_hairpinning_handoff_trace_t *t =
+           vlib_add_trace (vm, node, b[0], sizeof (*t));
+         t->next_worker_index = ti[0];
+       }
+
+      n_left_from -= 1;
+      ti += 1;
+      b += 1;
+    }
+  n_enq = vlib_buffer_enqueue_to_thread (vm, node, fq_index, from,
+                                        thread_indices, frame->n_vectors, 1);
+
+  if (n_enq < frame->n_vectors)
+    vlib_node_increment_counter (
+      vm, node->node_index, NAT44_EI_HAIRPINNING_HANDOFF_ERROR_CONGESTION_DROP,
+      frame->n_vectors - n_enq);
+  return frame->n_vectors;
+}
+
+static_always_inline uword
+nat44_ei_in2out_node_fn_inline (vlib_main_t *vm, vlib_node_runtime_t *node,
+                               vlib_frame_t *frame, int is_slow_path,
+                               int is_output_feature)
 {
   u32 n_left_from, *from;
-  snat_main_t *sm = &snat_main;
+  nat44_ei_main_t *nm = &nat44_ei_main;
   f64 now = vlib_time_now (vm);
   u32 thread_index = vm->thread_index;
 
@@ -875,7 +1290,9 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
     {
       vlib_buffer_t *b0, *b1;
       u32 next0, next1;
-      u32 sw_if_index0, sw_if_index1;
+      u32 rx_sw_if_index0, rx_sw_if_index1;
+      u32 tx_sw_if_index0, tx_sw_if_index1;
+      u32 cntr_sw_if_index0, cntr_sw_if_index1;
       ip4_header_t *ip0, *ip1;
       ip_csum_t sum0, sum1;
       u32 new_addr0, old_addr0, new_addr1, old_addr1;
@@ -885,7 +1302,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       icmp46_header_t *icmp0, *icmp1;
       u32 rx_fib_index0, rx_fib_index1;
       u32 proto0, proto1;
-      snat_session_t *s0 = 0, *s1 = 0;
+      nat44_ei_session_t *s0 = 0, *s1 = 0;
       clib_bihash_kv_8_8_t kv0, value0, kv1, value1;
       u32 iph_offset0 = 0, iph_offset1 = 0;
 
@@ -905,8 +1322,8 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
          vlib_prefetch_buffer_header (p2, LOAD);
          vlib_prefetch_buffer_header (p3, LOAD);
 
-         CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD);
-         CLIB_PREFETCH (p3->data, CLIB_CACHE_LINE_BYTES, LOAD);
+         clib_prefetch_load (p2->data);
+         clib_prefetch_load (p3->data);
        }
 
       if (is_output_feature)
@@ -919,11 +1336,14 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       tcp0 = (tcp_header_t *) udp0;
       icmp0 = (icmp46_header_t *) udp0;
 
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index,
-                              sw_if_index0);
+      rx_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      tx_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      cntr_sw_if_index0 =
+       is_output_feature ? tx_sw_if_index0 : rx_sw_if_index0;
+      rx_fib_index0 =
+       vec_elt (nm->ip4_main->fib_index_by_sw_if_index, rx_sw_if_index0);
 
-      next0 = next1 = SNAT_IN2OUT_NEXT_LOOKUP;
+      next0 = next1 = NAT44_EI_IN2OUT_NEXT_LOOKUP;
 
       if (PREDICT_FALSE (ip0->ttl == 1))
        {
@@ -931,7 +1351,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
          icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
                                       ICMP4_time_exceeded_ttl_exceeded_in_transit,
                                       0);
-         next0 = SNAT_IN2OUT_NEXT_ICMP_ERROR;
+         next0 = NAT44_EI_IN2OUT_NEXT_ICMP_ERROR;
          goto trace00;
        }
 
@@ -942,30 +1362,28 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
        {
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
            {
-             if (nat_in2out_sm_unknown_proto (sm, b0, ip0, rx_fib_index0))
+             if (nat_in2out_sm_unknown_proto (nm, b0, ip0, rx_fib_index0))
                {
-                 next0 = SNAT_IN2OUT_NEXT_DROP;
+                 next0 = NAT44_EI_IN2OUT_NEXT_DROP;
                  b0->error =
-                   node->errors[SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
+                   node->errors[NAT44_EI_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
                }
-             vlib_increment_simple_counter (is_slow_path ? &sm->
-                                            counters.slowpath.in2out.
-                                            other : &sm->counters.fastpath.
-                                            in2out.other, thread_index,
-                                            sw_if_index0, 1);
+             vlib_increment_simple_counter (
+               is_slow_path ? &nm->counters.slowpath.in2out.other :
+                              &nm->counters.fastpath.in2out.other,
+               thread_index, cntr_sw_if_index0, 1);
              goto trace00;
            }
 
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
            {
-             next0 = icmp_in2out_slow_path
-               (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0,
-                node, next0, now, thread_index, &s0);
-             vlib_increment_simple_counter (is_slow_path ? &sm->
-                                            counters.slowpath.in2out.
-                                            icmp : &sm->counters.fastpath.
-                                            in2out.icmp, thread_index,
-                                            sw_if_index0, 1);
+             next0 = nat44_ei_icmp_in2out_slow_path (
+               nm, b0, ip0, icmp0, rx_sw_if_index0, rx_fib_index0, node,
+               next0, now, thread_index, &s0);
+             vlib_increment_simple_counter (
+               is_slow_path ? &nm->counters.slowpath.in2out.icmp :
+                              &nm->counters.fastpath.in2out.icmp,
+               thread_index, cntr_sw_if_index0, 1);
              goto trace00;
            }
        }
@@ -973,13 +1391,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
        {
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
            {
-             next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next0 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace00;
            }
 
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
            {
-             next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next0 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace00;
            }
        }
@@ -987,19 +1405,18 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       init_nat_k (&kv0, ip0->src_address,
                  vnet_buffer (b0)->ip.reass.l4_src_port, rx_fib_index0,
                  proto0);
-      if (PREDICT_FALSE (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0) !=
+      if (PREDICT_FALSE (clib_bihash_search_8_8 (&nm->in2out, &kv0, &value0) !=
                         0))
        {
          if (is_slow_path)
            {
              if (is_output_feature)
                {
-                 if (PREDICT_FALSE
-                     (nat_not_translate_output_feature
-                      (sm, ip0, proto0,
+                 if (PREDICT_FALSE (nat44_ei_not_translate_output_feature (
+                       nm, ip0, proto0,
                        vnet_buffer (b0)->ip.reass.l4_src_port,
-                       vnet_buffer (b0)->ip.reass.l4_dst_port,
-                       thread_index, sw_if_index0)))
+                       vnet_buffer (b0)->ip.reass.l4_dst_port, thread_index,
+                       rx_sw_if_index0)))
                    goto trace00;
 
                  /*
@@ -1016,19 +1433,17 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                }
              else
                {
-                 if (PREDICT_FALSE
-                     (snat_not_translate
-                      (sm, node, sw_if_index0, ip0, proto0,
-                       rx_fib_index0, thread_index)))
+                 if (PREDICT_FALSE (nat44_ei_not_translate (
+                       nm, node, rx_sw_if_index0, ip0, proto0, rx_fib_index0,
+                       thread_index)))
                    goto trace00;
                }
 
-             next0 = slow_path (sm, b0, ip0,
-                                ip0->src_address,
+             next0 = slow_path (nm, b0, ip0, ip0->src_address,
                                 vnet_buffer (b0)->ip.reass.l4_src_port,
-                                rx_fib_index0,
-                                proto0, &s0, node, next0, thread_index, now);
-             if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
+                                rx_fib_index0, proto0, &s0, node, next0,
+                                thread_index, now);
+             if (PREDICT_FALSE (next0 == NAT44_EI_IN2OUT_NEXT_DROP))
                goto trace00;
 
              if (PREDICT_FALSE (!s0))
@@ -1036,12 +1451,12 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
            }
          else
            {
-             next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next0 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace00;
            }
        }
       else
-       s0 = pool_elt_at_index (sm->per_thread_data[thread_index].sessions,
+       s0 = pool_elt_at_index (nm->per_thread_data[thread_index].sessions,
                                nat_value_get_session_index (&value0));
 
       b0->flags |= VNET_BUFFER_F_IS_NATED;
@@ -1071,13 +1486,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
              sum0 = ip_csum_update (sum0, old_port0, new_port0,
                                     ip4_header_t /* cheat */ ,
                                     length /* changed member */ );
-             mss_clamping (sm->mss_clamping, tcp0, &sum0);
+             mss_clamping (nm->mss_clamping, tcp0, &sum0);
              tcp0->checksum = ip_csum_fold (sum0);
            }
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.tcp : &sm->
-                                        counters.fastpath.in2out.tcp,
-                                        thread_index, sw_if_index0, 1);
+         vlib_increment_simple_counter (is_slow_path ?
+                                          &nm->counters.slowpath.in2out.tcp :
+                                          &nm->counters.fastpath.in2out.tcp,
+                                        thread_index, cntr_sw_if_index0, 1);
        }
       else
        {
@@ -1098,39 +1513,38 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  udp0->checksum = ip_csum_fold (sum0);
                }
            }
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.udp : &sm->
-                                        counters.fastpath.in2out.udp,
-                                        thread_index, sw_if_index0, 1);
+         vlib_increment_simple_counter (is_slow_path ?
+                                          &nm->counters.slowpath.in2out.udp :
+                                          &nm->counters.fastpath.in2out.udp,
+                                        thread_index, cntr_sw_if_index0, 1);
        }
 
       /* Accounting */
       nat44_ei_session_update_counters (
        s0, now, vlib_buffer_length_in_chain (vm, b0), thread_index);
       /* Per-user LRU list maintenance */
-      nat44_session_update_lru (sm, s0, thread_index);
+      nat44_ei_session_update_lru (nm, s0, thread_index);
     trace00:
 
       if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
                         && (b0->flags & VLIB_BUFFER_IS_TRACED)))
        {
-         snat_in2out_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+         nat44_ei_in2out_trace_t *t =
+           vlib_add_trace (vm, node, b0, sizeof (*t));
          t->is_slow_path = is_slow_path;
-         t->sw_if_index = sw_if_index0;
+         t->sw_if_index = rx_sw_if_index0;
          t->next_index = next0;
          t->session_index = ~0;
          if (s0)
-           t->session_index =
-             s0 - sm->per_thread_data[thread_index].sessions;
+           t->session_index = s0 - nm->per_thread_data[thread_index].sessions;
        }
 
-      if (next0 == SNAT_IN2OUT_NEXT_DROP)
+      if (next0 == NAT44_EI_IN2OUT_NEXT_DROP)
        {
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.
-                                        drops : &sm->counters.fastpath.
-                                        in2out.drops, thread_index,
-                                        sw_if_index0, 1);
+         vlib_increment_simple_counter (
+           is_slow_path ? &nm->counters.slowpath.in2out.drops :
+                          &nm->counters.fastpath.in2out.drops,
+           thread_index, cntr_sw_if_index0, 1);
        }
 
       if (is_output_feature)
@@ -1143,9 +1557,12 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       tcp1 = (tcp_header_t *) udp1;
       icmp1 = (icmp46_header_t *) udp1;
 
-      sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
-      rx_fib_index1 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index,
-                              sw_if_index1);
+      rx_sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_RX];
+      tx_sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX];
+      cntr_sw_if_index1 =
+       is_output_feature ? tx_sw_if_index1 : rx_sw_if_index1;
+      rx_fib_index1 =
+       vec_elt (nm->ip4_main->fib_index_by_sw_if_index, rx_sw_if_index1);
 
       if (PREDICT_FALSE (ip1->ttl == 1))
        {
@@ -1153,7 +1570,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
          icmp4_error_set_vnet_buffer (b1, ICMP4_time_exceeded,
                                       ICMP4_time_exceeded_ttl_exceeded_in_transit,
                                       0);
-         next1 = SNAT_IN2OUT_NEXT_ICMP_ERROR;
+         next1 = NAT44_EI_IN2OUT_NEXT_ICMP_ERROR;
          goto trace01;
        }
 
@@ -1164,30 +1581,28 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
        {
          if (PREDICT_FALSE (proto1 == NAT_PROTOCOL_OTHER))
            {
-             if (nat_in2out_sm_unknown_proto (sm, b1, ip1, rx_fib_index1))
+             if (nat_in2out_sm_unknown_proto (nm, b1, ip1, rx_fib_index1))
                {
-                 next1 = SNAT_IN2OUT_NEXT_DROP;
+                 next1 = NAT44_EI_IN2OUT_NEXT_DROP;
                  b1->error =
-                   node->errors[SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
+                   node->errors[NAT44_EI_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
                }
-             vlib_increment_simple_counter (is_slow_path ? &sm->
-                                            counters.slowpath.in2out.
-                                            other : &sm->counters.fastpath.
-                                            in2out.other, thread_index,
-                                            sw_if_index1, 1);
+             vlib_increment_simple_counter (
+               is_slow_path ? &nm->counters.slowpath.in2out.other :
+                              &nm->counters.fastpath.in2out.other,
+               thread_index, cntr_sw_if_index1, 1);
              goto trace01;
            }
 
          if (PREDICT_FALSE (proto1 == NAT_PROTOCOL_ICMP))
            {
-             next1 = icmp_in2out_slow_path
-               (sm, b1, ip1, icmp1, sw_if_index1, rx_fib_index1, node,
-                next1, now, thread_index, &s1);
-             vlib_increment_simple_counter (is_slow_path ? &sm->
-                                            counters.slowpath.in2out.
-                                            icmp : &sm->counters.fastpath.
-                                            in2out.icmp, thread_index,
-                                            sw_if_index1, 1);
+             next1 = nat44_ei_icmp_in2out_slow_path (
+               nm, b1, ip1, icmp1, rx_sw_if_index1, rx_fib_index1, node,
+               next1, now, thread_index, &s1);
+             vlib_increment_simple_counter (
+               is_slow_path ? &nm->counters.slowpath.in2out.icmp :
+                              &nm->counters.fastpath.in2out.icmp,
+               thread_index, cntr_sw_if_index1, 1);
              goto trace01;
            }
        }
@@ -1195,13 +1610,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
        {
          if (PREDICT_FALSE (proto1 == NAT_PROTOCOL_OTHER))
            {
-             next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next1 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace01;
            }
 
          if (PREDICT_FALSE (proto1 == NAT_PROTOCOL_ICMP))
            {
-             next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next1 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace01;
            }
        }
@@ -1209,19 +1624,18 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       init_nat_k (&kv1, ip1->src_address,
                  vnet_buffer (b1)->ip.reass.l4_src_port, rx_fib_index1,
                  proto1);
-      if (PREDICT_FALSE (clib_bihash_search_8_8 (&sm->in2out, &kv1, &value1) !=
+      if (PREDICT_FALSE (clib_bihash_search_8_8 (&nm->in2out, &kv1, &value1) !=
                         0))
        {
          if (is_slow_path)
            {
              if (is_output_feature)
                {
-                 if (PREDICT_FALSE
-                     (nat_not_translate_output_feature
-                      (sm, ip1, proto1,
+                 if (PREDICT_FALSE (nat44_ei_not_translate_output_feature (
+                       nm, ip1, proto1,
                        vnet_buffer (b1)->ip.reass.l4_src_port,
-                       vnet_buffer (b1)->ip.reass.l4_dst_port,
-                       thread_index, sw_if_index1)))
+                       vnet_buffer (b1)->ip.reass.l4_dst_port, thread_index,
+                       rx_sw_if_index1)))
                    goto trace01;
 
                  /*
@@ -1238,19 +1652,17 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                }
              else
                {
-                 if (PREDICT_FALSE
-                     (snat_not_translate
-                      (sm, node, sw_if_index1, ip1, proto1,
-                       rx_fib_index1, thread_index)))
+                 if (PREDICT_FALSE (nat44_ei_not_translate (
+                       nm, node, rx_sw_if_index1, ip1, proto1, rx_fib_index1,
+                       thread_index)))
                    goto trace01;
                }
 
-             next1 =
-               slow_path (sm, b1, ip1, ip1->src_address,
-                          vnet_buffer (b1)->ip.reass.l4_src_port,
-                          rx_fib_index1, proto1, &s1, node, next1,
-                          thread_index, now);
-             if (PREDICT_FALSE (next1 == SNAT_IN2OUT_NEXT_DROP))
+             next1 = slow_path (nm, b1, ip1, ip1->src_address,
+                                vnet_buffer (b1)->ip.reass.l4_src_port,
+                                rx_fib_index1, proto1, &s1, node, next1,
+                                thread_index, now);
+             if (PREDICT_FALSE (next1 == NAT44_EI_IN2OUT_NEXT_DROP))
                goto trace01;
 
              if (PREDICT_FALSE (!s1))
@@ -1258,12 +1670,12 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
            }
          else
            {
-             next1 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next1 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace01;
            }
        }
       else
-       s1 = pool_elt_at_index (sm->per_thread_data[thread_index].sessions,
+       s1 = pool_elt_at_index (nm->per_thread_data[thread_index].sessions,
                                nat_value_get_session_index (&value1));
 
       b1->flags |= VNET_BUFFER_F_IS_NATED;
@@ -1292,13 +1704,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
              sum1 = ip_csum_update (sum1, old_port1, new_port1,
                                     ip4_header_t /* cheat */ ,
                                     length /* changed member */ );
-             mss_clamping (sm->mss_clamping, tcp1, &sum1);
+             mss_clamping (nm->mss_clamping, tcp1, &sum1);
              tcp1->checksum = ip_csum_fold (sum1);
            }
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.tcp : &sm->
-                                        counters.fastpath.in2out.tcp,
-                                        thread_index, sw_if_index1, 1);
+         vlib_increment_simple_counter (is_slow_path ?
+                                          &nm->counters.slowpath.in2out.tcp :
+                                          &nm->counters.fastpath.in2out.tcp,
+                                        thread_index, cntr_sw_if_index1, 1);
        }
       else
        {
@@ -1319,38 +1731,37 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  udp1->checksum = ip_csum_fold (sum1);
                }
            }
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.udp : &sm->
-                                        counters.fastpath.in2out.udp,
-                                        thread_index, sw_if_index1, 1);
+         vlib_increment_simple_counter (is_slow_path ?
+                                          &nm->counters.slowpath.in2out.udp :
+                                          &nm->counters.fastpath.in2out.udp,
+                                        thread_index, cntr_sw_if_index1, 1);
        }
 
       /* Accounting */
       nat44_ei_session_update_counters (
        s1, now, vlib_buffer_length_in_chain (vm, b1), thread_index);
       /* Per-user LRU list maintenance */
-      nat44_session_update_lru (sm, s1, thread_index);
+      nat44_ei_session_update_lru (nm, s1, thread_index);
     trace01:
 
       if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
                         && (b1->flags & VLIB_BUFFER_IS_TRACED)))
        {
-         snat_in2out_trace_t *t = vlib_add_trace (vm, node, b1, sizeof (*t));
-         t->sw_if_index = sw_if_index1;
+         nat44_ei_in2out_trace_t *t =
+           vlib_add_trace (vm, node, b1, sizeof (*t));
+         t->sw_if_index = rx_sw_if_index1;
          t->next_index = next1;
          t->session_index = ~0;
          if (s1)
-           t->session_index =
-             s1 - sm->per_thread_data[thread_index].sessions;
+           t->session_index = s1 - nm->per_thread_data[thread_index].sessions;
        }
 
-      if (next1 == SNAT_IN2OUT_NEXT_DROP)
+      if (next1 == NAT44_EI_IN2OUT_NEXT_DROP)
        {
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.
-                                        drops : &sm->counters.fastpath.
-                                        in2out.drops, thread_index,
-                                        sw_if_index1, 1);
+         vlib_increment_simple_counter (
+           is_slow_path ? &nm->counters.slowpath.in2out.drops :
+                          &nm->counters.fastpath.in2out.drops,
+           thread_index, cntr_sw_if_index1, 1);
        }
 
       n_left_from -= 2;
@@ -1363,7 +1774,9 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
     {
       vlib_buffer_t *b0;
       u32 next0;
-      u32 sw_if_index0;
+      u32 rx_sw_if_index0;
+      u32 tx_sw_if_index0;
+      u32 cntr_sw_if_index0;
       ip4_header_t *ip0;
       ip_csum_t sum0;
       u32 new_addr0, old_addr0;
@@ -1373,13 +1786,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       icmp46_header_t *icmp0;
       u32 rx_fib_index0;
       u32 proto0;
-      snat_session_t *s0 = 0;
+      nat44_ei_session_t *s0 = 0;
       clib_bihash_kv_8_8_t kv0, value0;
       u32 iph_offset0 = 0;
 
       b0 = *b;
       b++;
-      next0 = SNAT_IN2OUT_NEXT_LOOKUP;
+      next0 = NAT44_EI_IN2OUT_NEXT_LOOKUP;
 
       if (is_output_feature)
        iph_offset0 = vnet_buffer (b0)->ip.reass.save_rewrite_length;
@@ -1391,9 +1804,12 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
       tcp0 = (tcp_header_t *) udp0;
       icmp0 = (icmp46_header_t *) udp0;
 
-      sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
-      rx_fib_index0 = vec_elt (sm->ip4_main->fib_index_by_sw_if_index,
-                              sw_if_index0);
+      rx_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+      tx_sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_TX];
+      cntr_sw_if_index0 =
+       is_output_feature ? tx_sw_if_index0 : rx_sw_if_index0;
+      rx_fib_index0 =
+       vec_elt (nm->ip4_main->fib_index_by_sw_if_index, rx_sw_if_index0);
 
       if (PREDICT_FALSE (ip0->ttl == 1))
        {
@@ -1401,7 +1817,7 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
          icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
                                       ICMP4_time_exceeded_ttl_exceeded_in_transit,
                                       0);
-         next0 = SNAT_IN2OUT_NEXT_ICMP_ERROR;
+         next0 = NAT44_EI_IN2OUT_NEXT_ICMP_ERROR;
          goto trace0;
        }
 
@@ -1412,30 +1828,28 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
        {
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
            {
-             if (nat_in2out_sm_unknown_proto (sm, b0, ip0, rx_fib_index0))
+             if (nat_in2out_sm_unknown_proto (nm, b0, ip0, rx_fib_index0))
                {
-                 next0 = SNAT_IN2OUT_NEXT_DROP;
+                 next0 = NAT44_EI_IN2OUT_NEXT_DROP;
                  b0->error =
-                   node->errors[SNAT_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
+                   node->errors[NAT44_EI_IN2OUT_ERROR_UNSUPPORTED_PROTOCOL];
                }
-             vlib_increment_simple_counter (is_slow_path ? &sm->
-                                            counters.slowpath.in2out.
-                                            other : &sm->counters.fastpath.
-                                            in2out.other, thread_index,
-                                            sw_if_index0, 1);
+             vlib_increment_simple_counter (
+               is_slow_path ? &nm->counters.slowpath.in2out.other :
+                              &nm->counters.fastpath.in2out.other,
+               thread_index, cntr_sw_if_index0, 1);
              goto trace0;
            }
 
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
            {
-             next0 = icmp_in2out_slow_path
-               (sm, b0, ip0, icmp0, sw_if_index0, rx_fib_index0, node,
-                next0, now, thread_index, &s0);
-             vlib_increment_simple_counter (is_slow_path ? &sm->
-                                            counters.slowpath.in2out.
-                                            icmp : &sm->counters.fastpath.
-                                            in2out.icmp, thread_index,
-                                            sw_if_index0, 1);
+             next0 = nat44_ei_icmp_in2out_slow_path (
+               nm, b0, ip0, icmp0, rx_sw_if_index0, rx_fib_index0, node,
+               next0, now, thread_index, &s0);
+             vlib_increment_simple_counter (
+               is_slow_path ? &nm->counters.slowpath.in2out.icmp :
+                              &nm->counters.fastpath.in2out.icmp,
+               thread_index, cntr_sw_if_index0, 1);
              goto trace0;
            }
        }
@@ -1443,13 +1857,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
        {
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
            {
-             next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next0 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace0;
            }
 
          if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
            {
-             next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next0 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace0;
            }
        }
@@ -1458,18 +1872,17 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  vnet_buffer (b0)->ip.reass.l4_src_port, rx_fib_index0,
                  proto0);
 
-      if (clib_bihash_search_8_8 (&sm->in2out, &kv0, &value0))
+      if (clib_bihash_search_8_8 (&nm->in2out, &kv0, &value0))
        {
          if (is_slow_path)
            {
              if (is_output_feature)
                {
-                 if (PREDICT_FALSE
-                     (nat_not_translate_output_feature
-                      (sm, ip0, proto0,
+                 if (PREDICT_FALSE (nat44_ei_not_translate_output_feature (
+                       nm, ip0, proto0,
                        vnet_buffer (b0)->ip.reass.l4_src_port,
-                       vnet_buffer (b0)->ip.reass.l4_dst_port,
-                       thread_index, sw_if_index0)))
+                       vnet_buffer (b0)->ip.reass.l4_dst_port, thread_index,
+                       rx_sw_if_index0)))
                    goto trace0;
 
                  /*
@@ -1486,20 +1899,18 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                }
              else
                {
-                 if (PREDICT_FALSE
-                     (snat_not_translate
-                      (sm, node, sw_if_index0, ip0, proto0, rx_fib_index0,
+                 if (PREDICT_FALSE (nat44_ei_not_translate (
+                       nm, node, rx_sw_if_index0, ip0, proto0, rx_fib_index0,
                        thread_index)))
                    goto trace0;
                }
 
-             next0 =
-               slow_path (sm, b0, ip0, ip0->src_address,
-                          vnet_buffer (b0)->ip.reass.l4_src_port,
-                          rx_fib_index0, proto0, &s0, node, next0,
-                          thread_index, now);
+             next0 = slow_path (nm, b0, ip0, ip0->src_address,
+                                vnet_buffer (b0)->ip.reass.l4_src_port,
+                                rx_fib_index0, proto0, &s0, node, next0,
+                                thread_index, now);
 
-             if (PREDICT_FALSE (next0 == SNAT_IN2OUT_NEXT_DROP))
+             if (PREDICT_FALSE (next0 == NAT44_EI_IN2OUT_NEXT_DROP))
                goto trace0;
 
              if (PREDICT_FALSE (!s0))
@@ -1507,12 +1918,12 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
            }
          else
            {
-             next0 = SNAT_IN2OUT_NEXT_SLOW_PATH;
+             next0 = NAT44_EI_IN2OUT_NEXT_SLOW_PATH;
              goto trace0;
            }
        }
       else
-       s0 = pool_elt_at_index (sm->per_thread_data[thread_index].sessions,
+       s0 = pool_elt_at_index (nm->per_thread_data[thread_index].sessions,
                                nat_value_get_session_index (&value0));
 
       b0->flags |= VNET_BUFFER_F_IS_NATED;
@@ -1542,13 +1953,13 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                ip_csum_update (sum0, old_port0, new_port0,
                                ip4_header_t /* cheat */ ,
                                length /* changed member */ );
-             mss_clamping (sm->mss_clamping, tcp0, &sum0);
+             mss_clamping (nm->mss_clamping, tcp0, &sum0);
              tcp0->checksum = ip_csum_fold (sum0);
            }
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.tcp : &sm->
-                                        counters.fastpath.in2out.tcp,
-                                        thread_index, sw_if_index0, 1);
+         vlib_increment_simple_counter (is_slow_path ?
+                                          &nm->counters.slowpath.in2out.tcp :
+                                          &nm->counters.fastpath.in2out.tcp,
+                                        thread_index, cntr_sw_if_index0, 1);
        }
       else
        {
@@ -1570,39 +1981,38 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
                  udp0->checksum = ip_csum_fold (sum0);
                }
            }
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.udp : &sm->
-                                        counters.fastpath.in2out.udp,
-                                        thread_index, sw_if_index0, 1);
+         vlib_increment_simple_counter (is_slow_path ?
+                                          &nm->counters.slowpath.in2out.udp :
+                                          &nm->counters.fastpath.in2out.udp,
+                                        thread_index, cntr_sw_if_index0, 1);
        }
 
       /* Accounting */
       nat44_ei_session_update_counters (
        s0, now, vlib_buffer_length_in_chain (vm, b0), thread_index);
       /* Per-user LRU list maintenance */
-      nat44_session_update_lru (sm, s0, thread_index);
+      nat44_ei_session_update_lru (nm, s0, thread_index);
 
     trace0:
       if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
                         && (b0->flags & VLIB_BUFFER_IS_TRACED)))
        {
-         snat_in2out_trace_t *t = vlib_add_trace (vm, node, b0, sizeof (*t));
+         nat44_ei_in2out_trace_t *t =
+           vlib_add_trace (vm, node, b0, sizeof (*t));
          t->is_slow_path = is_slow_path;
-         t->sw_if_index = sw_if_index0;
+         t->sw_if_index = rx_sw_if_index0;
          t->next_index = next0;
          t->session_index = ~0;
          if (s0)
-           t->session_index =
-             s0 - sm->per_thread_data[thread_index].sessions;
+           t->session_index = s0 - nm->per_thread_data[thread_index].sessions;
        }
 
-      if (next0 == SNAT_IN2OUT_NEXT_DROP)
+      if (next0 == NAT44_EI_IN2OUT_NEXT_DROP)
        {
-         vlib_increment_simple_counter (is_slow_path ? &sm->
-                                        counters.slowpath.in2out.
-                                        drops : &sm->counters.fastpath.
-                                        in2out.drops, thread_index,
-                                        sw_if_index0, 1);
+         vlib_increment_simple_counter (
+           is_slow_path ? &nm->counters.slowpath.in2out.drops :
+                          &nm->counters.fastpath.in2out.drops,
+           thread_index, cntr_sw_if_index0, 1);
        }
 
       n_left_from--;
@@ -1615,142 +2025,121 @@ snat_in2out_node_fn_inline (vlib_main_t * vm,
   return frame->n_vectors;
 }
 
-VLIB_NODE_FN (snat_in2out_node) (vlib_main_t * vm,
-                                vlib_node_runtime_t * node,
-                                vlib_frame_t * frame)
+static_always_inline uword
+nat44_ei_in2out_hairpinning_finish_inline (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);
-}
-
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (snat_in2out_node) = {
-  .name = "nat44-in2out",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
+  u32 n_left_from, *from, *to_next;
+  u32 thread_index = vm->thread_index;
+  nat44_ei_in2out_next_t next_index;
+  nat44_ei_main_t *nm = &nat44_ei_main;
+  int is_hairpinning = 0;
 
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+  from = vlib_frame_vector_args (frame);
+  n_left_from = frame->n_vectors;
+  next_index = node->cached_next_index;
 
-  /* edit / add dispositions here */
-  .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",
-  },
-};
-/* *INDENT-ON* */
+  while (n_left_from > 0)
+    {
+      u32 n_left_to_next;
 
-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);
-}
+      vlib_get_next_frame (vm, node, next_index, to_next, n_left_to_next);
 
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (snat_in2out_output_node) = {
-  .name = "nat44-in2out-output",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
+      while (n_left_from > 0 && n_left_to_next > 0)
+       {
+         u32 bi0;
+         vlib_buffer_t *b0;
+         u32 next0;
+         u32 sw_if_index0;
+         ip4_header_t *ip0;
+         udp_header_t *udp0;
+         tcp_header_t *tcp0;
+         icmp46_header_t *icmp0;
+         u32 proto0;
+         u32 required_thread_index = thread_index;
 
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
+         bi0 = from[0];
+         to_next[0] = bi0;
+         from += 1;
+         to_next += 1;
+         n_left_from -= 1;
+         n_left_to_next -= 1;
 
-  .runtime_data_bytes = sizeof (snat_runtime_t),
+         b0 = vlib_get_buffer (vm, bi0);
+         next0 = NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_LOOKUP;
 
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+         ip0 = vlib_buffer_get_current (b0);
+         udp0 = ip4_next_header (ip0);
+         tcp0 = (tcp_header_t *) udp0;
+         icmp0 = (icmp46_header_t *) udp0;
 
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
-    [SNAT_IN2OUT_NEXT_LOOKUP] = "interface-output",
-    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-output-slowpath",
-    [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-  },
-};
-/* *INDENT-ON* */
+         sw_if_index0 = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+         proto0 = ip_proto_to_nat_proto (ip0->protocol);
 
-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);
-}
+         switch (proto0)
+           {
+           case NAT_PROTOCOL_TCP:
+             // fallthrough
+           case NAT_PROTOCOL_UDP:
+             is_hairpinning = nat44_ei_hairpinning (
+               vm, node, nm, thread_index, b0, ip0, udp0, tcp0, proto0,
+               0 /* do_trace */, &required_thread_index);
+             break;
+           case NAT_PROTOCOL_ICMP:
+             is_hairpinning = (0 == nat44_ei_icmp_hairpinning (
+                                      nm, b0, thread_index, ip0, icmp0,
+                                      &required_thread_index));
+             break;
+           case NAT_PROTOCOL_OTHER:
+             // this should never happen
+             next0 = NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_DROP;
+             break;
+           }
 
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (snat_in2out_slowpath_node) = {
-  .name = "nat44-in2out-slowpath",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
+         if (thread_index != required_thread_index)
+           {
+             // but we already did a handoff ...
+             next0 = NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_DROP;
+           }
 
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
+         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&
+                            (b0->flags & VLIB_BUFFER_IS_TRACED)))
+           {
+             nat44_ei_in2out_trace_t *t =
+               vlib_add_trace (vm, node, b0, sizeof (*t));
+             t->sw_if_index = sw_if_index0;
+             t->next_index = next0;
+             t->is_hairpinning = is_hairpinning;
+           }
 
-  .runtime_data_bytes = sizeof (snat_runtime_t),
+         if (next0 != NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_DROP)
+           {
+             vlib_increment_simple_counter (
+               &nm->counters.fastpath.in2out.other, sw_if_index0,
+               vm->thread_index, 1);
+           }
 
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+         vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+                                          n_left_to_next, bi0, next0);
+       }
 
-  /* edit / add dispositions here */
-  .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",
-  },
-};
-/* *INDENT-ON* */
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
 
-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);
+  return frame->n_vectors;
 }
 
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (snat_in2out_output_slowpath_node) = {
-  .name = "nat44-in2out-output-slowpath",
-  .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_trace,
-  .type = VLIB_NODE_TYPE_INTERNAL,
-
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
-
-  .runtime_data_bytes = sizeof (snat_runtime_t),
-
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
-
-  /* edit / add dispositions here */
-  .next_nodes = {
-    [SNAT_IN2OUT_NEXT_DROP] = "error-drop",
-    [SNAT_IN2OUT_NEXT_LOOKUP] = "interface-output",
-    [SNAT_IN2OUT_NEXT_SLOW_PATH] = "nat44-in2out-output-slowpath",
-    [SNAT_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
-  },
-};
-/* *INDENT-ON* */
-
-VLIB_NODE_FN (snat_in2out_fast_node) (vlib_main_t * vm,
-                                     vlib_node_runtime_t * node,
-                                     vlib_frame_t * frame)
+VLIB_NODE_FN (nat44_ei_hairpinning_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;
-  snat_main_t *sm = &snat_main;
-  int is_hairpinning = 0;
+  u32 thread_index = vm->thread_index;
+  nat44_ei_hairpin_next_t next_index;
+  nat44_ei_main_t *nm = &nat44_ei_main;
+  vnet_feature_main_t *fm = &feature_main;
+  u8 arc_index = vnet_feat_arc_ip4_local.feature_arc_index;
+  vnet_feature_config_main_t *cm = &fm->feature_config_mains[arc_index];
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -1767,22 +2156,13 @@ VLIB_NODE_FN (snat_in2out_fast_node) (vlib_main_t * vm,
          u32 bi0;
          vlib_buffer_t *b0;
          u32 next0;
-         u32 sw_if_index0;
          ip4_header_t *ip0;
-         ip_csum_t sum0;
-         u32 new_addr0, old_addr0;
-         u16 old_port0, new_port0;
+         u32 proto0;
          udp_header_t *udp0;
          tcp_header_t *tcp0;
-         icmp46_header_t *icmp0;
-         u32 proto0;
-         u32 rx_fib_index0;
-         ip4_address_t sm0_addr;
-         u16 sm0_port;
-         u32 sm0_fib_index;
-
+         u32 sw_if_index0;
+         u32 required_thread_index = thread_index;
 
-         /* speculatively enqueue b0 to the current next frame */
          bi0 = from[0];
          to_next[0] = bi0;
          from += 1;
@@ -1791,169 +2171,258 @@ VLIB_NODE_FN (snat_in2out_fast_node) (vlib_main_t * vm,
          n_left_to_next -= 1;
 
          b0 = vlib_get_buffer (vm, bi0);
-         next0 = SNAT_IN2OUT_NEXT_LOOKUP;
-
          ip0 = vlib_buffer_get_current (b0);
          udp0 = ip4_next_header (ip0);
          tcp0 = (tcp_header_t *) udp0;
-         icmp0 = (icmp46_header_t *) udp0;
-
          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);
-
-         if (PREDICT_FALSE (ip0->ttl == 1))
-           {
-             vnet_buffer (b0)->sw_if_index[VLIB_TX] = (u32) ~ 0;
-             icmp4_error_set_vnet_buffer (b0, ICMP4_time_exceeded,
-                                          ICMP4_time_exceeded_ttl_exceeded_in_transit,
-                                          0);
-             next0 = SNAT_IN2OUT_NEXT_ICMP_ERROR;
-             goto trace0;
-           }
 
          proto0 = ip_proto_to_nat_proto (ip0->protocol);
+         int next0_resolved = 0;
 
-         if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_OTHER))
-           goto trace0;
+         if (nat44_ei_hairpinning (vm, node, nm, thread_index, b0, ip0, udp0,
+                                   tcp0, proto0, 1, &required_thread_index))
+           {
+             next0 = NAT44_EI_HAIRPIN_NEXT_LOOKUP;
+             next0_resolved = 1;
+           }
 
-         if (PREDICT_FALSE (proto0 == NAT_PROTOCOL_ICMP))
+         if (thread_index != required_thread_index)
            {
-             next0 = icmp_in2out (sm, b0, ip0, icmp0, sw_if_index0,
-                                  rx_fib_index0, node, next0, ~0, 0);
-             goto trace0;
+             vnet_buffer (b0)->snat.required_thread_index =
+               required_thread_index;
+             next0 = NAT44_EI_HAIRPIN_NEXT_HANDOFF;
+             next0_resolved = 1;
            }
 
-         if (nat44_ei_static_mapping_match (
-               ip0->src_address, udp0->src_port, rx_fib_index0, proto0,
-               &sm0_addr, &sm0_port, &sm0_fib_index, 0, 0, 0))
+         if (!next0_resolved)
+           vnet_get_config_data (&cm->config_main, &b0->current_config_index,
+                                 &next0, 0);
+
+         if (next0 != NAT44_EI_HAIRPIN_NEXT_DROP)
            {
-             b0->error = node->errors[SNAT_IN2OUT_ERROR_NO_TRANSLATION];
-             next0 = SNAT_IN2OUT_NEXT_DROP;
-             goto trace0;
+             vlib_increment_simple_counter (
+               &nm->counters.hairpinning, vm->thread_index, sw_if_index0, 1);
            }
 
-         new_addr0 = sm0_addr.as_u32;
-         new_port0 = sm0_port;
-         vnet_buffer (b0)->sw_if_index[VLIB_TX] = sm0_fib_index;
-         old_addr0 = ip0->src_address.as_u32;
-         ip0->src_address.as_u32 = new_addr0;
+         vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next,
+                                          n_left_to_next, bi0, next0);
+       }
 
-         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);
+      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
+    }
 
-         if (PREDICT_FALSE (new_port0 != udp0->dst_port))
-           {
-             old_port0 = udp0->src_port;
-             udp0->src_port = new_port0;
+  return frame->n_vectors;
+}
 
-             if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
-               {
-                 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->mss_clamping, 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 */ );
-                 sum0 = ip_csum_update (sum0, old_port0, new_port0,
-                                        ip4_header_t /* cheat */ ,
-                                        length /* changed member */ );
-                 udp0->checksum = ip_csum_fold (sum0);
-               }
-           }
-         else
-           {
-             if (PREDICT_TRUE (proto0 == NAT_PROTOCOL_TCP))
-               {
-                 sum0 = tcp0->checksum;
-                 sum0 = ip_csum_update (sum0, old_addr0, new_addr0,
-                                        ip4_header_t,
-                                        dst_address /* changed member */ );
-                 mss_clamping (sm->mss_clamping, 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);
-               }
-           }
+VLIB_NODE_FN (nat44_ei_in2out_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_in2out_node_fn_inline (vm, node, frame, 0, 0);
+}
 
-         /* Hairpinning */
-         is_hairpinning = snat_hairpinning (vm, node, sm, b0, ip0, udp0, tcp0,
-                                            proto0, 0 /* do_trace */);
+VLIB_NODE_FN (nat44_ei_in2out_output_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_in2out_node_fn_inline (vm, node, frame, 0, 1);
+}
 
-       trace0:
-         if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE)
-                            && (b0->flags & VLIB_BUFFER_IS_TRACED)))
-           {
-             snat_in2out_trace_t *t =
-               vlib_add_trace (vm, node, b0, sizeof (*t));
-             t->sw_if_index = sw_if_index0;
-             t->next_index = next0;
-             t->is_hairpinning = is_hairpinning;
-           }
+VLIB_NODE_FN (nat44_ei_in2out_slowpath_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_in2out_node_fn_inline (vm, node, frame, 1, 0);
+}
 
-         if (next0 != SNAT_IN2OUT_NEXT_DROP)
-           {
+VLIB_NODE_FN (nat44_ei_in2out_output_slowpath_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_in2out_node_fn_inline (vm, node, frame, 1, 1);
+}
 
-             vlib_increment_simple_counter (&sm->counters.fastpath.
-                                            in2out.other, sw_if_index0,
-                                            vm->thread_index, 1);
-           }
+VLIB_NODE_FN (nat44_ei_in2out_hairpinning_handoff_ip4_lookup_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_hairpinning_handoff_fn_inline (
+    vm, node, frame,
+    nat44_ei_main.in2out_hairpinning_finish_ip4_lookup_node_fq_index);
+}
 
-         /* 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);
-       }
+VLIB_NODE_FN (nat44_ei_in2out_hairpinning_handoff_interface_output_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_hairpinning_handoff_fn_inline (
+    vm, node, frame,
+    nat44_ei_main.in2out_hairpinning_finish_interface_output_node_fq_index);
+}
 
-      vlib_put_next_frame (vm, node, next_index, n_left_to_next);
-    }
+VLIB_NODE_FN (nat44_ei_in2out_hairpinning_finish_ip4_lookup_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_in2out_hairpinning_finish_inline (vm, node, frame);
+}
 
-  return frame->n_vectors;
+VLIB_NODE_FN (nat44_ei_in2out_hairpinning_finish_interface_output_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_in2out_hairpinning_finish_inline (vm, node, frame);
 }
 
+VLIB_NODE_FN (nat44_ei_hairpinning_handoff_node)
+(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame)
+{
+  return nat44_ei_hairpinning_handoff_fn_inline (
+    vm, node, frame, nat44_ei_main.hairpinning_fq_index);
+}
 
-/* *INDENT-OFF* */
-VLIB_REGISTER_NODE (snat_in2out_fast_node) = {
-  .name = "nat44-in2out-fast",
+VLIB_REGISTER_NODE (nat44_ei_in2out_node) = {
+  .name = "nat44-ei-in2out",
   .vector_size = sizeof (u32),
-  .format_trace = format_snat_in2out_fast_trace,
+  .format_trace = format_nat44_ei_in2out_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(nat44_ei_in2out_error_strings),
+  .error_strings = nat44_ei_in2out_error_strings,
+  .runtime_data_bytes = sizeof (nat44_ei_runtime_t),
+  .n_next_nodes = NAT44_EI_IN2OUT_N_NEXT,
+  .next_nodes = {
+    [NAT44_EI_IN2OUT_NEXT_DROP] = "error-drop",
+    [NAT44_EI_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
+    [NAT44_EI_IN2OUT_NEXT_SLOW_PATH] = "nat44-ei-in2out-slowpath",
+    [NAT44_EI_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+    [NAT44_EI_IN2OUT_NEXT_HAIRPINNING_HANDOFF] = "nat44-ei-in2out-hairpinning-handoff-ip4-lookup",
+  },
+};
 
-  .n_errors = ARRAY_LEN(snat_in2out_error_strings),
-  .error_strings = snat_in2out_error_strings,
+VLIB_REGISTER_NODE (nat44_ei_in2out_output_node) = {
+  .name = "nat44-ei-in2out-output",
+  .vector_size = sizeof (u32),
+  .format_trace = format_nat44_ei_in2out_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(nat44_ei_in2out_error_strings),
+  .error_strings = nat44_ei_in2out_error_strings,
+  .runtime_data_bytes = sizeof (nat44_ei_runtime_t),
+  .n_next_nodes = NAT44_EI_IN2OUT_N_NEXT,
+  .next_nodes = {
+    [NAT44_EI_IN2OUT_NEXT_DROP] = "error-drop",
+    [NAT44_EI_IN2OUT_NEXT_LOOKUP] = "interface-output",
+    [NAT44_EI_IN2OUT_NEXT_SLOW_PATH] = "nat44-ei-in2out-output-slowpath",
+    [NAT44_EI_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+    [NAT44_EI_IN2OUT_NEXT_HAIRPINNING_HANDOFF] = "nat44-ei-in2out-hairpinning-handoff-interface-output",
+  },
+};
 
-  .runtime_data_bytes = sizeof (snat_runtime_t),
+VLIB_REGISTER_NODE (nat44_ei_in2out_slowpath_node) = {
+  .name = "nat44-ei-in2out-slowpath",
+  .vector_size = sizeof (u32),
+  .format_trace = format_nat44_ei_in2out_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(nat44_ei_in2out_error_strings),
+  .error_strings = nat44_ei_in2out_error_strings,
+  .runtime_data_bytes = sizeof (nat44_ei_runtime_t),
+  .n_next_nodes = NAT44_EI_IN2OUT_N_NEXT,
+  .next_nodes = {
+    [NAT44_EI_IN2OUT_NEXT_DROP] = "error-drop",
+    [NAT44_EI_IN2OUT_NEXT_LOOKUP] = "ip4-lookup",
+    [NAT44_EI_IN2OUT_NEXT_SLOW_PATH] = "nat44-ei-in2out-slowpath",
+    [NAT44_EI_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+    [NAT44_EI_IN2OUT_NEXT_HAIRPINNING_HANDOFF] = "nat44-ei-in2out-hairpinning-handoff-ip4-lookup",
+  },
+};
 
-  .n_next_nodes = SNAT_IN2OUT_N_NEXT,
+VLIB_REGISTER_NODE (nat44_ei_in2out_output_slowpath_node) = {
+  .name = "nat44-ei-in2out-output-slowpath",
+  .vector_size = sizeof (u32),
+  .format_trace = format_nat44_ei_in2out_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(nat44_ei_in2out_error_strings),
+  .error_strings = nat44_ei_in2out_error_strings,
+  .runtime_data_bytes = sizeof (nat44_ei_runtime_t),
+  .n_next_nodes = NAT44_EI_IN2OUT_N_NEXT,
+  .next_nodes = {
+    [NAT44_EI_IN2OUT_NEXT_DROP] = "error-drop",
+    [NAT44_EI_IN2OUT_NEXT_LOOKUP] = "interface-output",
+    [NAT44_EI_IN2OUT_NEXT_SLOW_PATH] = "nat44-ei-in2out-output-slowpath",
+    [NAT44_EI_IN2OUT_NEXT_ICMP_ERROR] = "ip4-icmp-error",
+    [NAT44_EI_IN2OUT_NEXT_HAIRPINNING_HANDOFF] = "nat44-ei-in2out-hairpinning-handoff-interface-output",
+  },
+};
 
-  /* edit / add dispositions here */
+VLIB_REGISTER_NODE (nat44_ei_in2out_hairpinning_handoff_ip4_lookup_node) = {
+  .name = "nat44-ei-in2out-hairpinning-handoff-ip4-lookup",
+  .vector_size = sizeof (u32),
+  .n_errors = ARRAY_LEN(nat44_ei_hairpinning_handoff_error_strings),
+  .error_strings = nat44_ei_hairpinning_handoff_error_strings,
+  .format_trace = format_nat44_ei_hairpinning_handoff_trace,
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_REGISTER_NODE (nat44_ei_in2out_hairpinning_handoff_interface_output_node) = {
+  .name = "nat44-ei-in2out-hairpinning-handoff-interface-output",
+  .vector_size = sizeof (u32),
+  .n_errors = ARRAY_LEN(nat44_ei_hairpinning_handoff_error_strings),
+  .error_strings = nat44_ei_hairpinning_handoff_error_strings,
+  .format_trace = format_nat44_ei_hairpinning_handoff_trace,
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_REGISTER_NODE (nat44_ei_in2out_hairpinning_finish_ip4_lookup_node) = {
+  .name = "nat44-ei-in2out-hairpinning-finish-ip4-lookup",
+  .vector_size = sizeof (u32),
+  .format_trace = format_nat44_ei_in2out_fast_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(nat44_ei_in2out_error_strings),
+  .error_strings = nat44_ei_in2out_error_strings,
+  .runtime_data_bytes = sizeof (nat44_ei_runtime_t),
+  .n_next_nodes = NAT44_EI_IN2OUT_HAIRPINNING_FINISH_N_NEXT,
+  .next_nodes = {
+    [NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_DROP] = "error-drop",
+    [NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_LOOKUP] = "ip4-lookup",
+  },
+};
+
+VLIB_REGISTER_NODE (nat44_ei_in2out_hairpinning_finish_interface_output_node) = {
+  .name = "nat44-ei-in2out-hairpinning-finish-interface-output",
+  .vector_size = sizeof (u32),
+  .format_trace = format_nat44_ei_in2out_fast_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .n_errors = ARRAY_LEN(nat44_ei_in2out_error_strings),
+  .error_strings = nat44_ei_in2out_error_strings,
+  .runtime_data_bytes = sizeof (nat44_ei_runtime_t),
+  .n_next_nodes = NAT44_EI_IN2OUT_HAIRPINNING_FINISH_N_NEXT,
+  .next_nodes = {
+    [NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_DROP] = "error-drop",
+    [NAT44_EI_IN2OUT_HAIRPINNING_FINISH_NEXT_LOOKUP] = "interface-output",
+  },
+};
+
+VLIB_REGISTER_NODE (nat44_ei_hairpinning_handoff_node) = {
+  .name = "nat44-ei-hairpinning-handoff",
+  .vector_size = sizeof (u32),
+  .n_errors = ARRAY_LEN(nat44_ei_hairpinning_handoff_error_strings),
+  .error_strings = nat44_ei_hairpinning_handoff_error_strings,
+  .format_trace = format_nat44_ei_hairpinning_handoff_trace,
+  .n_next_nodes = 1,
+  .next_nodes = {
+    [0] = "error-drop",
+  },
+};
+
+VLIB_REGISTER_NODE (nat44_ei_hairpinning_node) = {
+  .name = "nat44-ei-hairpinning",
+  .vector_size = sizeof (u32),
+  .type = VLIB_NODE_TYPE_INTERNAL,
+  .format_trace = format_nat44_ei_hairpin_trace,
+  .n_next_nodes = NAT44_EI_HAIRPIN_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",
+    [NAT44_EI_HAIRPIN_NEXT_DROP] = "error-drop",
+    [NAT44_EI_HAIRPIN_NEXT_LOOKUP] = "ip4-lookup",
+    [NAT44_EI_HAIRPIN_NEXT_HANDOFF] = "nat44-ei-hairpinning-handoff",
   },
 };
-/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON