nat: fix ICMP error translation
[vpp.git] / src / plugins / nat / nat44-ed / nat44_ed.c
index d42d303..8f35643 100644 (file)
 #include <vppinfra/bihash_16_8.h>
 
 #include <nat/lib/log.h>
-#include <nat/lib/nat_syslog.h>
 #include <nat/lib/nat_inlines.h>
 #include <nat/lib/ipfix_logging.h>
+#include <vnet/syslog/syslog.h>
+#include <nat/lib/nat_syslog_constants.h>
+#include <nat/lib/nat_syslog.h>
 
 #include <nat/nat44-ed/nat44_ed.h>
 #include <nat/nat44-ed/nat44_ed_affinity.h>
 #include <nat/nat44-ed/nat44_ed_inlines.h>
 
-#include <vpp/stats/stat_segment.h>
+#include <vlib/stats/stats.h>
 
 snat_main_t snat_main;
 
@@ -177,34 +179,20 @@ VLIB_PLUGIN_REGISTER () = {
 };
 
 static void nat44_ed_db_init (u32 translations, u32 translation_buckets);
-
-static void nat44_ed_db_free ();
+static void nat44_ed_worker_db_free (snat_main_per_thread_data_t *tsm);
+
+static int nat44_ed_add_static_mapping_internal (
+  ip4_address_t l_addr, ip4_address_t e_addr, u16 l_port, u16 e_port,
+  ip_protocol_t proto, u32 vrf_id, u32 sw_if_index, u32 flags,
+  ip4_address_t pool_addr, u8 *tag);
+static int nat44_ed_del_static_mapping_internal (ip4_address_t l_addr,
+                                                ip4_address_t e_addr,
+                                                u16 l_port, u16 e_port,
+                                                ip_protocol_t proto,
+                                                u32 vrf_id, u32 flags);
 
 u32 nat_calc_bihash_buckets (u32 n_elts);
 
-u8 *
-format_session_kvp (u8 * s, va_list * args)
-{
-  clib_bihash_kv_8_8_t *v = va_arg (*args, clib_bihash_kv_8_8_t *);
-
-  s = format (s, "%U thread-index %llu session-index %llu", format_snat_key,
-             v->key, nat_value_get_thread_index (v),
-             nat_value_get_session_index (v));
-
-  return s;
-}
-
-u8 *
-format_static_mapping_kvp (u8 * s, va_list * args)
-{
-  clib_bihash_kv_8_8_t *v = va_arg (*args, clib_bihash_kv_8_8_t *);
-
-  s = format (s, "%U static-mapping-index %llu",
-             format_snat_key, v->key, v->value);
-
-  return s;
-}
-
 u8 *
 format_ed_session_kvp (u8 * s, va_list * args)
 {
@@ -227,868 +215,1199 @@ format_ed_session_kvp (u8 * s, va_list * args)
   return s;
 }
 
+static_always_inline int
+nat44_ed_sm_i2o_add (snat_main_t *sm, snat_static_mapping_t *m,
+                    ip4_address_t addr, u16 port, u32 fib_index, u8 proto)
+{
+  ASSERT (!pool_is_free (sm->static_mappings, m));
+  clib_bihash_kv_16_8_t kv;
+  nat44_ed_sm_init_i2o_kv (&kv, addr.as_u32, port, fib_index, proto,
+                          m - sm->static_mappings);
+  return clib_bihash_add_del_16_8 (&sm->flow_hash, &kv, 1 /*is_add*/);
+}
+
+static_always_inline int
+nat44_ed_sm_i2o_del (snat_main_t *sm, ip4_address_t addr, u16 port,
+                    u32 fib_index, u8 proto)
+{
+  clib_bihash_kv_16_8_t kv;
+  nat44_ed_sm_init_i2o_k (&kv, addr.as_u32, port, fib_index, proto);
+  return clib_bihash_add_del_16_8 (&sm->flow_hash, &kv, 0 /*is_add*/);
+}
+
+static_always_inline int
+nat44_ed_sm_o2i_add (snat_main_t *sm, snat_static_mapping_t *m,
+                    ip4_address_t addr, u16 port, u32 fib_index, u8 proto)
+{
+  ASSERT (!pool_is_free (sm->static_mappings, m));
+  clib_bihash_kv_16_8_t kv;
+  nat44_ed_sm_init_o2i_kv (&kv, addr.as_u32, port, fib_index, proto,
+                          m - sm->static_mappings);
+  return clib_bihash_add_del_16_8 (&sm->flow_hash, &kv, 1 /*is_add*/);
+}
+
+static_always_inline int
+nat44_ed_sm_o2i_del (snat_main_t *sm, ip4_address_t addr, u16 port,
+                    u32 fib_index, u8 proto)
+{
+  clib_bihash_kv_16_8_t kv;
+  nat44_ed_sm_init_o2i_k (&kv, addr.as_u32, port, fib_index, proto);
+  return clib_bihash_add_del_16_8 (&sm->flow_hash, &kv, 0 /*is_add*/);
+}
+
 void
-nat_free_session_data (snat_main_t * sm, snat_session_t * s, u32 thread_index,
-                      u8 is_ha)
+nat44_ed_free_session_data (snat_main_t *sm, snat_session_t *s,
+                           u32 thread_index, u8 is_ha)
 {
-      per_vrf_sessions_unregister_session (s, thread_index);
+  per_vrf_sessions_unregister_session (s, thread_index);
 
-      if (nat_ed_ses_i2o_flow_hash_add_del (sm, thread_index, s, 0))
-       nat_elog_warn (sm, "flow hash del failed");
+  if (nat_ed_ses_i2o_flow_hash_add_del (sm, thread_index, s, 0))
+    nat_elog_warn (sm, "flow hash del failed");
 
-      if (nat_ed_ses_o2i_flow_hash_add_del (sm, thread_index, s, 0))
-       nat_elog_warn (sm, "flow hash del failed");
+  if (nat_ed_ses_o2i_flow_hash_add_del (sm, thread_index, s, 0))
+    nat_elog_warn (sm, "flow hash del failed");
 
-  if (is_fwd_bypass_session (s))
+  if (na44_ed_is_fwd_bypass_session (s))
     {
       return;
     }
 
-      if (is_affinity_sessions (s))
-       nat_affinity_unlock (s->ext_host_addr, s->out2in.addr,
-                            s->nat_proto, s->out2in.port);
-
-      if (!is_ha)
-       nat_syslog_nat44_sdel (
-         0, s->in2out.fib_index, &s->in2out.addr, s->in2out.port,
-         &s->ext_host_nat_addr, s->ext_host_nat_port, &s->out2in.addr,
-         s->out2in.port, &s->ext_host_addr, s->ext_host_port, s->nat_proto,
-         is_twice_nat_session (s));
+  if (nat44_ed_is_affinity_session (s))
+    nat_affinity_unlock (s->ext_host_addr, s->out2in.addr, s->proto,
+                        s->out2in.port);
 
-  if (snat_is_unk_proto_session (s))
-    return;
+  if (!is_ha)
+    nat_syslog_nat44_sdel (0, s->in2out.fib_index, &s->in2out.addr,
+                          s->in2out.port, &s->ext_host_nat_addr,
+                          s->ext_host_nat_port, &s->out2in.addr,
+                          s->out2in.port, &s->ext_host_addr, s->ext_host_port,
+                          s->proto, nat44_ed_is_twice_nat_session (s));
 
   if (!is_ha)
     {
       /* log NAT event */
-      nat_ipfix_logging_nat44_ses_delete (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);
-    }
-
-  /* Twice NAT address and port for external host */
-  if (is_twice_nat_session (s))
-    {
-      snat_free_outside_address_and_port (sm->twice_nat_addresses,
-                                         thread_index,
-                                         &s->ext_host_nat_addr,
-                                         s->ext_host_nat_port, s->nat_proto);
+      nat_ipfix_logging_nat44_ses_delete (
+       thread_index, s->in2out.addr.as_u32, s->out2in.addr.as_u32, s->proto,
+       s->in2out.port, s->out2in.port, s->in2out.fib_index);
     }
-
-  if (snat_is_session_static (s))
-    return;
-
-  snat_free_outside_address_and_port (sm->addresses, thread_index,
-                                     &s->out2in.addr, s->out2in.port,
-                                     s->nat_proto);
 }
 
-void
-snat_add_del_addr_to_fib (ip4_address_t * addr, u8 p_len, u32 sw_if_index,
-                         int is_add)
+static ip_interface_address_t *
+nat44_ed_get_ip_interface_address (u32 sw_if_index, ip4_address_t addr)
 {
   snat_main_t *sm = &snat_main;
-  fib_prefix_t prefix = {
-    .fp_len = p_len,
-    .fp_proto = FIB_PROTOCOL_IP4,
-    .fp_addr = {
-               .ip4.as_u32 = addr->as_u32,
-               },
-  };
-  u32 fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
 
-  if (is_add)
-    fib_table_entry_update_one_path (fib_index,
-                                    &prefix,
-                                    sm->fib_src_low,
-                                    (FIB_ENTRY_FLAG_CONNECTED |
-                                     FIB_ENTRY_FLAG_LOCAL |
-                                     FIB_ENTRY_FLAG_EXCLUSIVE),
-                                    DPO_PROTO_IP4,
-                                    NULL,
-                                    sw_if_index,
-                                    ~0, 1, NULL, FIB_ROUTE_PATH_FLAG_NONE);
-  else
-    fib_table_entry_delete (fib_index, &prefix, sm->fib_src_low);
+  ip_lookup_main_t *lm = &sm->ip4_main->lookup_main;
+  ip_interface_address_t *ia;
+  ip4_address_t *ip4a;
+
+  foreach_ip_interface_address (
+    lm, ia, sw_if_index, 1, ({
+      ip4a = ip_interface_address_get_address (lm, ia);
+      nat_log_debug ("sw_if_idx: %u addr: %U ? %U", sw_if_index,
+                    format_ip4_address, ip4a, format_ip4_address, &addr);
+      if (ip4a->as_u32 == addr.as_u32)
+       {
+         return ia;
+       }
+    }));
+  return NULL;
 }
 
-int
-snat_add_address (snat_main_t * sm, ip4_address_t * addr, u32 vrf_id,
-                 u8 twice_nat)
+static int
+nat44_ed_resolve_nat_addr_len (snat_address_t *ap,
+                              snat_interface_t *interfaces)
 {
-  snat_address_t *ap;
+  ip_interface_address_t *ia;
   snat_interface_t *i;
-  vlib_thread_main_t *tm = vlib_get_thread_main ();
+  u32 fib_index;
 
-  /* Check if address already exists */
-  vec_foreach (ap, twice_nat ? sm->twice_nat_addresses : sm->addresses)
+  pool_foreach (i, interfaces)
     {
-      if (ap->addr.as_u32 == addr->as_u32)
-        {
-          nat_log_err ("address exist");
-          return VNET_API_ERROR_VALUE_EXIST;
-        }
-    }
-
-  if (twice_nat)
-    vec_add2 (sm->twice_nat_addresses, ap, 1);
-  else
-    vec_add2 (sm->addresses, ap, 1);
-
-  ap->addr = *addr;
-  if (vrf_id != ~0)
-    ap->fib_index =
-      fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id,
-                                        sm->fib_src_low);
-  else
-    ap->fib_index = ~0;
-
-  #define _(N, i, n, s) \
-    clib_memset(ap->busy_##n##_port_refcounts, 0, sizeof(ap->busy_##n##_port_refcounts));\
-    ap->busy_##n##_ports = 0; \
-    ap->busy_##n##_ports_per_thread = 0;\
-    vec_validate_init_empty (ap->busy_##n##_ports_per_thread, tm->n_vlib_mains - 1, 0);
-    foreach_nat_protocol
-  #undef _
+      if (!nat44_ed_is_interface_outside (i))
+       {
+         continue;
+       }
 
-  if (twice_nat)
-    return 0;
+      fib_index = ip4_fib_table_get_index_for_sw_if_index (i->sw_if_index);
+      if (fib_index != ap->fib_index)
+       {
+         continue;
+       }
 
-  /* Add external address to FIB */
-  pool_foreach (i, sm->interfaces)
-   {
-     if (nat_interface_is_inside (i))
-       continue;
+      if ((ia = nat44_ed_get_ip_interface_address (i->sw_if_index, ap->addr)))
+       {
+         ap->addr_len = ia->address_length;
+         ap->sw_if_index = i->sw_if_index;
+         ap->net.as_u32 = (ap->addr.as_u32 >> (32 - ap->addr_len))
+                          << (32 - ap->addr_len);
+
+         nat_log_debug ("pool addr %U binds to -> sw_if_idx: %u net: %U/%u",
+                        format_ip4_address, &ap->addr, ap->sw_if_index,
+                        format_ip4_address, &ap->net, ap->addr_len);
+         return 0;
+       }
+    }
+  return 1;
+}
 
-     snat_add_del_addr_to_fib (addr, 32, i->sw_if_index, 1);
-     break;
-  }
-  pool_foreach (i, sm->output_feature_interfaces)
-   {
-     if (nat_interface_is_inside (i))
-       continue;
+static void
+nat44_ed_update_outside_if_addresses (snat_address_t *ap)
+{
+  snat_main_t *sm = &snat_main;
 
-     snat_add_del_addr_to_fib (addr, 32, i->sw_if_index, 1);
-     break;
-  }
+  if (!nat44_ed_resolve_nat_addr_len (ap, sm->interfaces))
+    {
+      return;
+    }
 
-  return 0;
+  if (!nat44_ed_resolve_nat_addr_len (ap, sm->output_feature_interfaces))
+    {
+      return;
+    }
 }
 
-static int
-is_snat_address_used_in_static_mapping (snat_main_t * sm, ip4_address_t addr)
+static void
+nat44_ed_bind_if_addr_to_nat_addr (u32 sw_if_index)
 {
-  snat_static_mapping_t *m;
-  pool_foreach (m, sm->static_mappings)
-   {
-      if (is_addr_only_static_mapping (m) ||
-          is_out2in_only_static_mapping (m) ||
-          is_identity_static_mapping (m))
-        continue;
-      if (m->external_addr.as_u32 == addr.as_u32)
-        return 1;
-  }
+  snat_main_t *sm = &snat_main;
+  ip_interface_address_t *ia;
+  snat_address_t *ap;
 
-  return 0;
-}
+  u32 fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
 
-static void
-snat_add_static_mapping_when_resolved (snat_main_t *sm, ip4_address_t l_addr,
-                                      u16 l_port, u32 sw_if_index, u16 e_port,
-                                      u32 vrf_id, nat_protocol_t proto,
-                                      int addr_only, u8 *tag, int twice_nat,
-                                      int out2in_only, int identity_nat,
-                                      ip4_address_t pool_addr, int exact)
-{
-  snat_static_map_resolve_t *rp;
-
-  vec_add2 (sm->to_resolve, rp, 1);
-  rp->l_addr.as_u32 = l_addr.as_u32;
-  rp->l_port = l_port;
-  rp->sw_if_index = sw_if_index;
-  rp->e_port = e_port;
-  rp->vrf_id = vrf_id;
-  rp->proto = proto;
-  rp->addr_only = addr_only;
-  rp->twice_nat = twice_nat;
-  rp->out2in_only = out2in_only;
-  rp->identity_nat = identity_nat;
-  rp->tag = vec_dup (tag);
-  rp->pool_addr = pool_addr;
-  rp->exact = exact;
+  vec_foreach (ap, sm->addresses)
+    {
+      if (fib_index != ap->fib_index)
+       {
+         continue;
+       }
+
+      if ((ia = nat44_ed_get_ip_interface_address (sw_if_index, ap->addr)))
+       {
+         ap->addr_len = ia->address_length;
+         ap->sw_if_index = sw_if_index;
+         ap->net.as_u32 = (ap->addr.as_u32 >> (32 - ap->addr_len))
+                          << (32 - ap->addr_len);
+
+         nat_log_debug ("pool addr %U binds to -> sw_if_idx: %u net: %U/%u",
+                        format_ip4_address, &ap->addr, ap->sw_if_index,
+                        format_ip4_address, &ap->net, ap->addr_len);
+         return;
+       }
+    }
 }
 
-u32
-get_thread_idx_by_port (u16 e_port)
+static_always_inline snat_fib_entry_reg_t *
+nat44_ed_get_fib_entry_reg (ip4_address_t addr, u32 sw_if_index, int *out_idx)
 {
   snat_main_t *sm = &snat_main;
-  u32 thread_idx = sm->num_workers;
-  if (sm->num_workers > 1)
+  snat_fib_entry_reg_t *fe;
+  int i;
+
+  for (i = 0; i < vec_len (sm->fib_entry_reg); i++)
     {
-      thread_idx =
-       sm->first_worker_index +
-       sm->workers[(e_port - 1024) / sm->port_per_thread];
+      fe = sm->fib_entry_reg + i;
+      if ((addr.as_u32 == fe->addr.as_u32) && (sw_if_index == fe->sw_if_index))
+       {
+         if (out_idx)
+           {
+             *out_idx = i;
+           }
+         return fe;
+       }
     }
-  return thread_idx;
+  return NULL;
 }
 
-void
-nat_ed_static_mapping_del_sessions (snat_main_t * sm,
-                                   snat_main_per_thread_data_t * tsm,
-                                   ip4_address_t l_addr,
-                                   u16 l_port,
-                                   u8 protocol,
-                                   u32 fib_index, int addr_only,
-                                   ip4_address_t e_addr, u16 e_port)
+static void
+nat44_ed_add_fib_entry_reg (ip4_address_t addr, u32 sw_if_index)
 {
-  snat_session_t *s;
-  u32 *indexes_to_free = NULL;
-  pool_foreach (s, tsm->sessions) {
-    if (s->in2out.fib_index != fib_index ||
-        s->in2out.addr.as_u32 != l_addr.as_u32)
-      {
-        continue;
-      }
-    if (!addr_only)
-      {
-        if ((s->out2in.addr.as_u32 != e_addr.as_u32) ||
-            s->out2in.port != e_port ||
-            s->in2out.port != l_port ||
-            s->nat_proto != protocol)
-          continue;
-      }
+  // Add the external NAT address to the FIB as receive entries. This ensures
+  // that VPP will reply to ARP for this address and we don't need to enable
+  // proxy ARP on the outside interface.
+  snat_main_t *sm = &snat_main;
+  snat_fib_entry_reg_t *fe;
 
-    if (is_lb_session (s))
-      continue;
-    if (!snat_is_session_static (s))
-      continue;
-    nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
-    vec_add1 (indexes_to_free, s - tsm->sessions);
-    if (!addr_only)
-      break;
-  }
-  u32 *ses_index;
-  vec_foreach (ses_index, indexes_to_free)
-  {
-    s = pool_elt_at_index (tsm->sessions, *ses_index);
-    nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
-  }
-  vec_free (indexes_to_free);
+  if (!(fe = nat44_ed_get_fib_entry_reg (addr, sw_if_index, 0)))
+    {
+      fib_prefix_t prefix = {
+        .fp_len = 32,
+        .fp_proto = FIB_PROTOCOL_IP4,
+        .fp_addr = {
+                 .ip4.as_u32 = addr.as_u32,
+               },
+      };
+      u32 fib_index = ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
+      fib_table_entry_update_one_path (fib_index, &prefix, sm->fib_src_low,
+                                      (FIB_ENTRY_FLAG_CONNECTED |
+                                       FIB_ENTRY_FLAG_LOCAL |
+                                       FIB_ENTRY_FLAG_EXCLUSIVE),
+                                      DPO_PROTO_IP4, NULL, sw_if_index, ~0, 1,
+                                      NULL, FIB_ROUTE_PATH_FLAG_NONE);
+
+      vec_add2 (sm->fib_entry_reg, fe, 1);
+      clib_memset (fe, 0, sizeof (*fe));
+      fe->addr.as_u32 = addr.as_u32;
+      fe->sw_if_index = sw_if_index;
+    }
+  fe->count++;
 }
 
-int
-snat_add_static_mapping (ip4_address_t l_addr, ip4_address_t e_addr,
-                        u16 l_port, u16 e_port, u32 vrf_id, int addr_only,
-                        u32 sw_if_index, nat_protocol_t proto, int is_add,
-                        twice_nat_type_t twice_nat, u8 out2in_only, u8 *tag,
-                        u8 identity_nat, ip4_address_t pool_addr, int exact)
+static void
+nat44_ed_del_fib_entry_reg (ip4_address_t addr, u32 sw_if_index)
 {
   snat_main_t *sm = &snat_main;
-  snat_static_mapping_t *m;
-  clib_bihash_kv_8_8_t kv, value;
-  snat_address_t *a = 0;
-  u32 fib_index = ~0;
-  snat_interface_t *interface;
-  snat_main_per_thread_data_t *tsm;
-  snat_static_map_resolve_t *rp, *rp_match = 0;
-  nat44_lb_addr_port_t *local;
-  u32 find = ~0;
+  snat_fib_entry_reg_t *fe;
   int i;
 
-  /* If the external address is a specific interface address */
-  if (sw_if_index != ~0)
+  if ((fe = nat44_ed_get_fib_entry_reg (addr, sw_if_index, &i)))
     {
-      ip4_address_t *first_int_addr;
-
-      for (i = 0; i < vec_len (sm->to_resolve); i++)
+      fe->count--;
+      if (0 == fe->count)
        {
-         rp = sm->to_resolve + i;
-         if (rp->sw_if_index != sw_if_index ||
-             rp->l_addr.as_u32 != l_addr.as_u32 ||
-             rp->vrf_id != vrf_id || rp->addr_only != addr_only)
-           continue;
-
-         if (!addr_only)
-           {
-             if ((rp->l_port != l_port && rp->e_port != e_port)
-                 || rp->proto != proto)
-               continue;
-           }
-
-         rp_match = rp;
-         break;
+         fib_prefix_t prefix = {
+            .fp_len = 32,
+            .fp_proto = FIB_PROTOCOL_IP4,
+            .fp_addr = {
+              .ip4.as_u32 = addr.as_u32,
+                   },
+          };
+         u32 fib_index =
+           ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
+         fib_table_entry_delete (fib_index, &prefix, sm->fib_src_low);
+         vec_del1 (sm->fib_entry_reg, i);
        }
+    }
+}
 
-      /* Might be already set... */
-      first_int_addr = ip4_interface_first_address
-       (sm->ip4_main, sw_if_index, 0 /* just want the address */ );
+static void
+nat44_ed_add_del_interface_fib_reg_entries (ip4_address_t addr, u8 is_add)
+{
+  snat_main_t *sm = &snat_main;
+  snat_interface_t *i;
 
-      if (is_add)
+  pool_foreach (i, sm->interfaces)
+    {
+      if (nat44_ed_is_interface_outside (i))
        {
-         if (rp_match)
-           return VNET_API_ERROR_VALUE_EXIST;
-
-         snat_add_static_mapping_when_resolved (
-           sm, l_addr, l_port, sw_if_index, e_port, vrf_id, proto, addr_only,
-           tag, twice_nat, out2in_only, identity_nat, pool_addr, exact);
-
-         /* DHCP resolution required? */
-         if (first_int_addr == 0)
+         if (is_add)
            {
-             return 0;
+             nat44_ed_add_fib_entry_reg (addr, i->sw_if_index);
            }
          else
            {
-             e_addr.as_u32 = first_int_addr->as_u32;
-             /* Identity mapping? */
-             if (l_addr.as_u32 == 0)
-               l_addr.as_u32 = e_addr.as_u32;
+             nat44_ed_del_fib_entry_reg (addr, i->sw_if_index);
            }
        }
-      else
+    }
+  pool_foreach (i, sm->output_feature_interfaces)
+    {
+      if (nat44_ed_is_interface_outside (i))
        {
-         if (!rp_match)
-           return VNET_API_ERROR_NO_SUCH_ENTRY;
-
-         vec_del1 (sm->to_resolve, i);
-
-         if (first_int_addr)
+         if (is_add)
            {
-             e_addr.as_u32 = first_int_addr->as_u32;
-             /* Identity mapping? */
-             if (l_addr.as_u32 == 0)
-               l_addr.as_u32 = e_addr.as_u32;
+             nat44_ed_add_fib_entry_reg (addr, i->sw_if_index);
            }
          else
-           return 0;
+           {
+             nat44_ed_del_fib_entry_reg (addr, i->sw_if_index);
+           }
        }
     }
+}
 
-  init_nat_k (&kv, e_addr, addr_only ? 0 : e_port, 0, addr_only ? 0 : proto);
-  if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
-    m = 0;
-  else
-    m = pool_elt_at_index (sm->static_mappings, value.value);
+static_always_inline void
+nat44_ed_add_del_nat_addr_fib_reg_entries (u32 sw_if_index, u8 is_add)
+{
+  snat_main_t *sm = &snat_main;
+  snat_address_t *ap;
 
-  if (is_add)
+  vec_foreach (ap, sm->addresses)
     {
-      if (m)
+      if (is_add)
        {
-         if (is_identity_static_mapping (m))
-           {
-              pool_foreach (local, m->locals)
-               {
-                if (local->vrf_id == vrf_id)
-                  return VNET_API_ERROR_VALUE_EXIST;
-              }
-             pool_get (m->locals, local);
-             local->vrf_id = vrf_id;
-             local->fib_index =
-               fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id,
-                                                  sm->fib_src_low);
-             init_nat_kv (&kv, m->local_addr, m->local_port, local->fib_index,
-                          m->proto, 0, m - sm->static_mappings);
-             clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv, 1);
-             return 0;
-           }
-         else
-           return VNET_API_ERROR_VALUE_EXIST;
+         nat44_ed_add_fib_entry_reg (ap->addr, sw_if_index);
        }
-
-      if (twice_nat && addr_only)
-       return VNET_API_ERROR_UNSUPPORTED;
-
-      /* Convert VRF id to FIB index */
-      if (vrf_id != ~0)
-       fib_index =
-         fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id,
-                                            sm->fib_src_low);
-      /* If not specified use inside VRF id from SNAT plugin startup config */
       else
        {
-         fib_index = sm->inside_fib_index;
-         vrf_id = sm->inside_vrf_id;
-         fib_table_lock (fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
+         nat44_ed_del_fib_entry_reg (ap->addr, sw_if_index);
        }
+    }
+}
 
-      if (!(out2in_only || identity_nat))
-       {
-         init_nat_k (&kv, l_addr, addr_only ? 0 : l_port, fib_index,
-                     addr_only ? 0 : proto);
-         if (!clib_bihash_search_8_8
-             (&sm->static_mapping_by_local, &kv, &value))
-           return VNET_API_ERROR_VALUE_EXIST;
-       }
+static_always_inline void
+nat44_ed_add_del_sm_fib_reg_entries (u32 sw_if_index, u8 is_add)
+{
+  snat_main_t *sm = &snat_main;
+  snat_static_mapping_t *m;
 
-      /* Find external address in allocated addresses and reserve port for
-         address and port pair mapping when dynamic translations enabled */
-      if (!(addr_only || sm->static_mapping_only || out2in_only))
+  pool_foreach (m, sm->static_mappings)
+    {
+      if (is_add)
        {
-         for (i = 0; i < vec_len (sm->addresses); i++)
-           {
-             if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
-               {
-                 a = sm->addresses + i;
-                 /* External port must be unused */
-                 switch (proto)
-                   {
-#define _(N, j, n, s) \
-                    case NAT_PROTOCOL_##N: \
-                      if (a->busy_##n##_port_refcounts[e_port]) \
-                        return VNET_API_ERROR_INVALID_VALUE; \
-                      ++a->busy_##n##_port_refcounts[e_port]; \
-                      if (e_port > 1024) \
-                        { \
-                          a->busy_##n##_ports++; \
-                          a->busy_##n##_ports_per_thread[get_thread_idx_by_port(e_port)]++; \
-                        } \
-                      break;
-                     foreach_nat_protocol
-#undef _
-                       default : nat_elog_info (sm, "unknown protocol");
-                     return VNET_API_ERROR_INVALID_VALUE_2;
-                   }
-                 break;
-               }
-           }
-         /* External address must be allocated */
-         if (!a && (l_addr.as_u32 != e_addr.as_u32))
-           {
-             if (sw_if_index != ~0)
-               {
-                 for (i = 0; i < vec_len (sm->to_resolve); i++)
-                   {
-                     rp = sm->to_resolve + i;
-                     if (rp->addr_only)
-                       continue;
-                     if (rp->sw_if_index != sw_if_index &&
-                         rp->l_addr.as_u32 != l_addr.as_u32 &&
-                         rp->vrf_id != vrf_id && rp->l_port != l_port &&
-                         rp->e_port != e_port && rp->proto != proto)
-                       continue;
-
-                     vec_del1 (sm->to_resolve, i);
-                     break;
-                   }
-               }
-             return VNET_API_ERROR_NO_SUCH_ENTRY;
-           }
+         nat44_ed_add_fib_entry_reg (m->external_addr, sw_if_index);
        }
-
-      pool_get (sm->static_mappings, m);
-      clib_memset (m, 0, sizeof (*m));
-      m->tag = vec_dup (tag);
-      m->local_addr = l_addr;
-      m->external_addr = e_addr;
-      m->twice_nat = twice_nat;
-
-      if (twice_nat == TWICE_NAT && exact)
+      else
        {
-         m->flags |= NAT_STATIC_MAPPING_FLAG_EXACT_ADDRESS;
-         m->pool_addr = pool_addr;
+         nat44_ed_del_fib_entry_reg (m->external_addr, sw_if_index);
        }
+    }
+}
 
-      if (out2in_only)
-       m->flags |= NAT_STATIC_MAPPING_FLAG_OUT2IN_ONLY;
-      if (addr_only)
-       m->flags |= NAT_STATIC_MAPPING_FLAG_ADDR_ONLY;
-      if (identity_nat)
+int
+nat44_ed_add_address (ip4_address_t *addr, u32 vrf_id, u8 twice_nat)
+{
+  snat_main_t *sm = &snat_main;
+  snat_address_t *ap, *addresses;
+
+  addresses = twice_nat ? sm->twice_nat_addresses : sm->addresses;
+
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  // check if address already exists
+  vec_foreach (ap, addresses)
+    {
+      if (ap->addr.as_u32 == addr->as_u32)
+        {
+          nat_log_err ("address exist");
+          return VNET_API_ERROR_VALUE_EXIST;
+        }
+    }
+
+  if (twice_nat)
+    {
+      vec_add2 (sm->twice_nat_addresses, ap, 1);
+    }
+  else
+    {
+      vec_add2 (sm->addresses, ap, 1);
+    }
+
+  ap->addr_len = ~0;
+  ap->fib_index = ~0;
+  ap->addr = *addr;
+
+  if (vrf_id != ~0)
+    {
+      ap->fib_index = fib_table_find_or_create_and_lock (
+       FIB_PROTOCOL_IP4, vrf_id, sm->fib_src_low);
+    }
+
+  if (!twice_nat)
+    {
+      // if we don't have enabled interface we don't add address
+      // to fib
+      nat44_ed_add_del_interface_fib_reg_entries (*addr, 1);
+      nat44_ed_update_outside_if_addresses (ap);
+    }
+  return 0;
+}
+
+int
+nat44_ed_del_address (ip4_address_t addr, u8 twice_nat)
+{
+  snat_main_t *sm = &snat_main;
+  snat_address_t *a = 0, *addresses;
+  snat_session_t *ses;
+  u32 *ses_to_be_removed = 0, *ses_index;
+  snat_main_per_thread_data_t *tsm;
+  int j;
+
+  addresses = twice_nat ? sm->twice_nat_addresses : sm->addresses;
+
+  for (j = 0; j < vec_len (addresses); j++)
+    {
+      if (addresses[j].addr.as_u32 == addr.as_u32)
        {
-         m->flags |= NAT_STATIC_MAPPING_FLAG_IDENTITY_NAT;
-         pool_get (m->locals, local);
-         local->vrf_id = vrf_id;
-         local->fib_index = fib_index;
+         a = addresses + j;
+         break;
        }
-      else
+    }
+  if (!a)
+    {
+      nat_log_err ("no such address");
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+
+  // delete dynamic sessions only
+  vec_foreach (tsm, sm->per_thread_data)
+    {
+      pool_foreach (ses, tsm->sessions)
        {
-         m->vrf_id = vrf_id;
-         m->fib_index = fib_index;
+         if (ses->flags & SNAT_SESSION_FLAG_STATIC_MAPPING)
+           {
+             continue;
+           }
+         if (ses->out2in.addr.as_u32 == addr.as_u32)
+           {
+             nat44_ed_free_session_data (sm, ses, tsm - sm->per_thread_data,
+                                         0);
+             vec_add1 (ses_to_be_removed, ses - tsm->sessions);
+           }
        }
-      if (!addr_only)
+      vec_foreach (ses_index, ses_to_be_removed)
        {
-         m->local_port = l_port;
-         m->external_port = e_port;
-         m->proto = proto;
+         ses = pool_elt_at_index (tsm->sessions, ses_index[0]);
+         nat_ed_session_delete (sm, ses, tsm - sm->per_thread_data, 1);
        }
+      vec_free (ses_to_be_removed);
+    }
 
-      if (sm->num_workers > 1)
+  if (!twice_nat)
+    {
+      nat44_ed_add_del_interface_fib_reg_entries (addr, 0);
+    }
+
+  if (a->fib_index != ~0)
+    {
+      fib_table_unlock (a->fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
+    }
+
+  if (!twice_nat)
+    {
+      vec_del1 (sm->addresses, j);
+    }
+  else
+    {
+      vec_del1 (sm->twice_nat_addresses, j);
+    }
+
+  return 0;
+}
+
+u32
+get_thread_idx_by_port (u16 e_port)
+{
+  snat_main_t *sm = &snat_main;
+  u32 thread_idx = sm->num_workers;
+  if (sm->num_workers > 1)
+    {
+      thread_idx =
+       sm->first_worker_index +
+       sm->workers[(e_port - 1024) / sm->port_per_thread];
+    }
+  return thread_idx;
+}
+
+void
+nat_ed_static_mapping_del_sessions (snat_main_t * sm,
+                                   snat_main_per_thread_data_t * tsm,
+                                   ip4_address_t l_addr,
+                                   u16 l_port,
+                                   u8 protocol,
+                                   u32 fib_index, int addr_only,
+                                   ip4_address_t e_addr, u16 e_port)
+{
+  snat_session_t *s;
+  u32 *indexes_to_free = NULL;
+  pool_foreach (s, tsm->sessions) {
+    if (s->in2out.fib_index != fib_index ||
+        s->in2out.addr.as_u32 != l_addr.as_u32)
+      {
+        continue;
+      }
+    if (!addr_only)
+      {
+       if ((s->out2in.addr.as_u32 != e_addr.as_u32) ||
+           s->out2in.port != e_port || s->in2out.port != l_port ||
+           s->proto != protocol)
+         continue;
+      }
+
+    if (nat44_ed_is_lb_session (s))
+      continue;
+    if (!nat44_ed_is_session_static (s))
+      continue;
+    nat44_ed_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
+    vec_add1 (indexes_to_free, s - tsm->sessions);
+    if (!addr_only)
+      break;
+  }
+  u32 *ses_index;
+  vec_foreach (ses_index, indexes_to_free)
+  {
+    s = pool_elt_at_index (tsm->sessions, *ses_index);
+    nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
+  }
+  vec_free (indexes_to_free);
+}
+
+static_always_inline snat_static_mapping_t *
+nat44_ed_sm_lookup (snat_main_t *sm, clib_bihash_kv_16_8_t *kv)
+{
+  clib_bihash_kv_16_8_t v;
+  int rc = clib_bihash_search_16_8 (&sm->flow_hash, kv, &v);
+  if (!rc)
+    {
+      ASSERT (0 == ed_value_get_thread_index (&v));
+      return pool_elt_at_index (sm->static_mappings,
+                               ed_value_get_session_index (&v));
+    }
+  return NULL;
+}
+
+snat_static_mapping_t *
+nat44_ed_sm_o2i_lookup (snat_main_t *sm, ip4_address_t addr, u16 port,
+                       u32 fib_index, u8 proto)
+{
+  clib_bihash_kv_16_8_t kv;
+  nat44_ed_sm_init_o2i_k (&kv, addr.as_u32, port, fib_index, proto);
+  return nat44_ed_sm_lookup (sm, &kv);
+}
+
+snat_static_mapping_t *
+nat44_ed_sm_i2o_lookup (snat_main_t *sm, ip4_address_t addr, u16 port,
+                       u32 fib_index, u8 proto)
+{
+  clib_bihash_kv_16_8_t kv;
+  nat44_ed_sm_init_i2o_k (&kv, addr.as_u32, port, fib_index, proto);
+  return nat44_ed_sm_lookup (sm, &kv);
+}
+
+static snat_static_mapping_resolve_t *
+nat44_ed_get_resolve_record (ip4_address_t l_addr, u16 l_port, u16 e_port,
+                            ip_protocol_t proto, u32 vrf_id, u32 sw_if_index,
+                            u32 flags, int *out_idx)
+{
+  snat_static_mapping_resolve_t *rp;
+  snat_main_t *sm = &snat_main;
+  int i;
+
+  for (i = 0; i < vec_len (sm->sm_to_resolve); i++)
+    {
+      rp = sm->sm_to_resolve + i;
+
+      if (rp->sw_if_index == sw_if_index && rp->vrf_id == vrf_id)
        {
-         ip4_header_t ip = {
-           .src_address = m->local_addr,
-         };
-         vec_add1 (m->workers, nat44_ed_get_in2out_worker_index (
-                                 0, &ip, m->fib_index, 0));
-         tsm = vec_elt_at_index (sm->per_thread_data, m->workers[0]);
+         if (is_sm_identity_nat (rp->flags) && is_sm_identity_nat (flags))
+           {
+             if (!(is_sm_addr_only (rp->flags) && is_sm_addr_only (flags)))
+               {
+                 if (rp->e_port != e_port || rp->proto != proto)
+                   {
+                     continue;
+                   }
+               }
+           }
+         else if (rp->l_addr.as_u32 == l_addr.as_u32)
+           {
+             if (!(is_sm_addr_only (rp->flags) && is_sm_addr_only (flags)))
+               {
+                 if (rp->l_port != l_port || rp->e_port != e_port ||
+                     rp->proto != proto)
+                   {
+                     continue;
+                   }
+               }
+           }
+         else
+           {
+             continue;
+           }
+         if (out_idx)
+           {
+             *out_idx = i;
+           }
+         return rp;
        }
-      else
-       tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
+    }
+  return NULL;
+}
 
-      if (!out2in_only)
+static int
+nat44_ed_del_resolve_record (ip4_address_t l_addr, u16 l_port, u16 e_port,
+                            ip_protocol_t proto, u32 vrf_id, u32 sw_if_index,
+                            u32 flags)
+{
+  snat_main_t *sm = &snat_main;
+  int i;
+  if (nat44_ed_get_resolve_record (l_addr, l_port, e_port, proto, vrf_id,
+                                  sw_if_index, flags, &i))
+    {
+      vec_del1 (sm->sm_to_resolve, i);
+      return 0;
+    }
+  return 1;
+}
+
+static_always_inline int
+nat44_ed_validate_sm_input (u32 flags)
+{
+  // identity nat can be initiated only from inside interface
+  if (is_sm_identity_nat (flags) && is_sm_out2in_only (flags))
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  if (is_sm_twice_nat (flags) || is_sm_self_twice_nat (flags))
+    {
+      if (is_sm_addr_only (flags) || is_sm_identity_nat (flags))
        {
-         init_nat_kv (&kv, m->local_addr, m->local_port, fib_index, m->proto,
-                      0, m - sm->static_mappings);
-         clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv, 1);
+         return VNET_API_ERROR_UNSUPPORTED;
        }
+    }
+  return 0;
+}
 
-      init_nat_kv (&kv, m->external_addr, m->external_port, 0, m->proto, 0,
-                  m - sm->static_mappings);
-      clib_bihash_add_del_8_8 (&sm->static_mapping_by_external, &kv, 1);
+int
+nat44_ed_add_static_mapping (ip4_address_t l_addr, ip4_address_t e_addr,
+                            u16 l_port, u16 e_port, ip_protocol_t proto,
+                            u32 vrf_id, u32 sw_if_index, u32 flags,
+                            ip4_address_t pool_addr, u8 *tag)
+{
+  snat_static_mapping_resolve_t *rp;
+  snat_main_t *sm = &snat_main;
+  int rv;
+
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
     }
-  else
+
+  rv = nat44_ed_validate_sm_input (flags);
+  if (rv != 0)
+    {
+      return rv;
+    }
+
+  // interface bound mapping
+  if (is_sm_switch_address (flags))
     {
-      if (!m)
+      if (nat44_ed_get_resolve_record (l_addr, l_port, e_port, proto, vrf_id,
+                                      sw_if_index, flags, 0))
        {
-         if (sw_if_index != ~0)
-           return 0;
-         else
-           return VNET_API_ERROR_NO_SUCH_ENTRY;
+         return VNET_API_ERROR_VALUE_EXIST;
        }
 
-      if (identity_nat)
+      vec_add2 (sm->sm_to_resolve, rp, 1);
+      rp->l_addr.as_u32 = l_addr.as_u32;
+      rp->l_port = l_port;
+      rp->e_port = e_port;
+      rp->sw_if_index = sw_if_index;
+      rp->vrf_id = vrf_id;
+      rp->proto = proto;
+      rp->flags = flags;
+      rp->pool_addr = pool_addr;
+      rp->tag = vec_dup (tag);
+      rp->is_resolved = 0;
+
+      ip4_address_t *first_int_addr =
+       ip4_interface_first_address (sm->ip4_main, sw_if_index, 0);
+      if (!first_int_addr)
        {
-         if (vrf_id == ~0)
-           vrf_id = sm->inside_vrf_id;
+         return 0;
+       }
 
-          pool_foreach (local, m->locals)
-           {
-           if (local->vrf_id == vrf_id)
-              find = local - m->locals;
-         }
-         if (find == ~0)
-           return VNET_API_ERROR_NO_SUCH_ENTRY;
+      e_addr.as_u32 = first_int_addr->as_u32;
+      rp->is_resolved = 1;
+    }
+
+  rv = nat44_ed_add_static_mapping_internal (l_addr, e_addr, l_port, e_port,
+                                            proto, vrf_id, sw_if_index, flags,
+                                            pool_addr, tag);
+  if ((0 != rv) && is_sm_switch_address (flags))
+    {
+      nat44_ed_del_resolve_record (l_addr, l_port, e_port, proto, vrf_id,
+                                  sw_if_index, flags);
+    }
+
+  return rv;
+}
+
+int
+nat44_ed_del_static_mapping (ip4_address_t l_addr, ip4_address_t e_addr,
+                            u16 l_port, u16 e_port, ip_protocol_t proto,
+                            u32 vrf_id, u32 sw_if_index, u32 flags)
+{
+  snat_main_t *sm = &snat_main;
+  int rv;
+
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  rv = nat44_ed_validate_sm_input (flags);
+  if (rv != 0)
+    {
+      return rv;
+    }
+
+  // interface bound mapping
+  if (is_sm_switch_address (flags))
+    {
+      if (nat44_ed_del_resolve_record (l_addr, l_port, e_port, proto, vrf_id,
+                                      sw_if_index, flags))
+       {
+         return VNET_API_ERROR_NO_SUCH_ENTRY;
+       }
+
+      ip4_address_t *first_int_addr =
+       ip4_interface_first_address (sm->ip4_main, sw_if_index, 0);
+      if (!first_int_addr)
+       {
+         // dhcp resolution required
+         return 0;
+       }
+
+      e_addr.as_u32 = first_int_addr->as_u32;
+    }
+
+  return nat44_ed_del_static_mapping_internal (l_addr, e_addr, l_port, e_port,
+                                              proto, vrf_id, flags);
+}
+
+static int
+nat44_ed_add_static_mapping_internal (ip4_address_t l_addr,
+                                     ip4_address_t e_addr, u16 l_port,
+                                     u16 e_port, ip_protocol_t proto,
+                                     u32 vrf_id, u32 sw_if_index, u32 flags,
+                                     ip4_address_t pool_addr, u8 *tag)
+{
+  snat_main_t *sm = &snat_main;
+  nat44_lb_addr_port_t *local;
+  snat_static_mapping_t *m;
+  u32 fib_index = ~0;
+
+  if (is_sm_addr_only (flags))
+    {
+      e_port = l_port = proto = 0;
+    }
+
+  if (is_sm_identity_nat (flags))
+    {
+      l_port = e_port;
+      l_addr.as_u32 = e_addr.as_u32;
+    }
+
+  m = nat44_ed_sm_o2i_lookup (sm, e_addr, e_port, 0, proto);
+  if (m)
+    {
+      // case:
+      // adding local identity nat record for different vrf table
+
+      if (!is_sm_identity_nat (m->flags))
+       {
+         return VNET_API_ERROR_VALUE_EXIST;
+       }
+
+      pool_foreach (local, m->locals)
+       {
+         if (local->vrf_id == vrf_id)
+           {
+             return VNET_API_ERROR_VALUE_EXIST;
+           }
+       }
+
+      pool_get (m->locals, local);
+
+      local->vrf_id = vrf_id;
+      local->fib_index = fib_table_find_or_create_and_lock (
+       FIB_PROTOCOL_IP4, vrf_id, sm->fib_src_low);
+
+      nat44_ed_sm_i2o_add (sm, m, m->local_addr, m->local_port,
+                          local->fib_index, m->proto);
+
+      return 0;
+    }
+
+  if (vrf_id != ~0)
+    {
+      fib_index = fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id,
+                                                    sm->fib_src_low);
+    }
+  else
+    {
+      // fallback to default vrf
+      vrf_id = sm->inside_vrf_id;
+      fib_index = sm->inside_fib_index;
+      fib_table_lock (fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
+    }
+
+  // test if local mapping record doesn't exist
+  // identity nat supports multiple records in local mapping
+  if (!(is_sm_out2in_only (flags) || is_sm_identity_nat (flags)))
+    {
+      if (nat44_ed_sm_i2o_lookup (sm, l_addr, l_port, fib_index, proto))
+       {
+         return VNET_API_ERROR_VALUE_EXIST;
+       }
+    }
+
+  pool_get (sm->static_mappings, m);
+  clib_memset (m, 0, sizeof (*m));
+
+  m->flags = flags;
+  m->local_addr = l_addr;
+  m->external_addr = e_addr;
+
+  m->pool_addr = pool_addr;
+  m->tag = vec_dup (tag);
+
+  if (!is_sm_addr_only (flags))
+    {
+      m->local_port = l_port;
+      m->external_port = e_port;
+      m->proto = proto;
+    }
+
+  if (is_sm_identity_nat (flags))
+    {
+      pool_get (m->locals, local);
+
+      local->vrf_id = vrf_id;
+      local->fib_index = fib_index;
+    }
+  else
+    {
+      m->vrf_id = vrf_id;
+      m->fib_index = fib_index;
+    }
+
+  if (!is_sm_out2in_only (flags))
+    {
+      nat44_ed_sm_i2o_add (sm, m, m->local_addr, m->local_port, fib_index,
+                          m->proto);
+    }
+
+  nat44_ed_sm_o2i_add (sm, m, m->external_addr, m->external_port, 0, m->proto);
+
+  if (sm->num_workers > 1)
+    {
+      // store worker index for this record
+      ip4_header_t ip = {
+       .src_address = m->local_addr,
+      };
+      u32 worker_index;
+      worker_index =
+       nat44_ed_get_in2out_worker_index (0, &ip, m->fib_index, 0);
+      vec_add1 (m->workers, worker_index);
+    }
+
+  nat44_ed_add_del_interface_fib_reg_entries (e_addr, 1);
+
+  return 0;
+}
+
+static int
+nat44_ed_del_static_mapping_internal (ip4_address_t l_addr,
+                                     ip4_address_t e_addr, u16 l_port,
+                                     u16 e_port, ip_protocol_t proto,
+                                     u32 vrf_id, u32 flags)
+{
+  snat_main_per_thread_data_t *tsm;
+  snat_main_t *sm = &snat_main;
+
+  nat44_lb_addr_port_t *local;
+  snat_static_mapping_t *m;
+  u32 fib_index = ~0;
+
+  if (is_sm_addr_only (flags))
+    {
+      e_port = l_port = proto = 0;
+    }
+
+  if (is_sm_identity_nat (flags))
+    {
+      l_port = e_port;
+      l_addr.as_u32 = e_addr.as_u32;
+    }
+
+  // fib index 0
+  m = nat44_ed_sm_o2i_lookup (sm, e_addr, e_port, 0, proto);
+  if (!m)
+    {
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
+
+  if (is_sm_identity_nat (flags))
+    {
+      u8 found = 0;
 
-         local = pool_elt_at_index (m->locals, find);
-         fib_index = local->fib_index;
-         pool_put (m->locals, local);
+      if (vrf_id == ~0)
+       {
+         vrf_id = sm->inside_vrf_id;
        }
-      else
-       fib_index = m->fib_index;
 
-      /* Free external address port */
-      if (!(addr_only || sm->static_mapping_only || out2in_only))
+      pool_foreach (local, m->locals)
        {
-         for (i = 0; i < vec_len (sm->addresses); i++)
+         if (local->vrf_id == vrf_id)
            {
-             if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
-               {
-                 a = sm->addresses + i;
-                 switch (proto)
-                   {
-#define _(N, j, n, s) \
-                    case NAT_PROTOCOL_##N: \
-                      --a->busy_##n##_port_refcounts[e_port]; \
-                      if (e_port > 1024) \
-                        { \
-                          a->busy_##n##_ports--; \
-                          a->busy_##n##_ports_per_thread[get_thread_idx_by_port(e_port)]--; \
-                        } \
-                      break;
-                     foreach_nat_protocol
-#undef _
-                       default : nat_elog_info (sm, "unknown protocol");
-                     return VNET_API_ERROR_INVALID_VALUE_2;
-                   }
-                 break;
-               }
+             local = pool_elt_at_index (m->locals, local - m->locals);
+             fib_index = local->fib_index;
+             pool_put (m->locals, local);
+             found = 1;
            }
        }
 
-      if (sm->num_workers > 1)
-       tsm = vec_elt_at_index (sm->per_thread_data, m->workers[0]);
-      else
-       tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
-
-      init_nat_k (&kv, m->local_addr, m->local_port, fib_index, m->proto);
-      if (!out2in_only)
-       clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv, 0);
-
-      /* Delete session(s) for static mapping if exist */
-      if (!(sm->static_mapping_only) ||
-         (sm->static_mapping_only && sm->static_mapping_connection_tracking))
+      if (!found)
        {
-         nat_ed_static_mapping_del_sessions (
-           sm, tsm, m->local_addr, m->local_port, m->proto, fib_index,
-           addr_only, e_addr, e_port);
+         return VNET_API_ERROR_NO_SUCH_ENTRY;
        }
+    }
+  else
+    {
+      fib_index = m->fib_index;
+    }
 
-      fib_table_unlock (fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
-      if (pool_elts (m->locals))
-       return 0;
-
-      init_nat_k (&kv, m->external_addr, m->external_port, 0, m->proto);
-      clib_bihash_add_del_8_8 (&sm->static_mapping_by_external, &kv, 0);
+  if (!is_sm_out2in_only (flags))
+    {
+      nat44_ed_sm_i2o_del (sm, l_addr, l_port, fib_index, proto);
+    }
 
-      vec_free (m->tag);
-      vec_free (m->workers);
-      /* Delete static mapping from pool */
-      pool_put (sm->static_mappings, m);
+  // delete sessions for static mapping
+  if (sm->num_workers > 1)
+    {
+      tsm = vec_elt_at_index (sm->per_thread_data, m->workers[0]);
+    }
+  else
+    {
+      tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
     }
 
-  if (!addr_only || (l_addr.as_u32 == e_addr.as_u32))
-    return 0;
+  nat_ed_static_mapping_del_sessions (sm, tsm, m->local_addr, m->local_port,
+                                     m->proto, fib_index,
+                                     is_sm_addr_only (flags), e_addr, e_port);
 
-  /* Add/delete external address to FIB */
-  pool_foreach (interface, sm->interfaces)
-   {
-     if (nat_interface_is_inside (interface))
-       continue;
+  fib_table_unlock (fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
 
-     snat_add_del_addr_to_fib (&e_addr, 32, interface->sw_if_index, is_add);
-     break;
-  }
-  pool_foreach (interface, sm->output_feature_interfaces)
-   {
-     if (nat_interface_is_inside (interface))
-       continue;
+  if (!pool_elts (m->locals))
+    {
+      // this is last record remove all required stuff
+      // fib_index 0
+      nat44_ed_sm_o2i_del (sm, e_addr, e_port, 0, proto);
 
-     snat_add_del_addr_to_fib (&e_addr, 32, interface->sw_if_index, is_add);
-     break;
-  }
+      vec_free (m->tag);
+      vec_free (m->workers);
+      pool_put (sm->static_mappings, m);
+
+      nat44_ed_add_del_interface_fib_reg_entries (e_addr, 0);
+    }
 
   return 0;
 }
 
 int
-nat44_add_del_lb_static_mapping (ip4_address_t e_addr, u16 e_port,
-                                nat_protocol_t proto,
-                                nat44_lb_addr_port_t * locals, u8 is_add,
-                                twice_nat_type_t twice_nat, u8 out2in_only,
-                                u8 * tag, u32 affinity)
+nat44_ed_add_lb_static_mapping (ip4_address_t e_addr, u16 e_port,
+                               ip_protocol_t proto,
+                               nat44_lb_addr_port_t *locals, u32 flags,
+                               u8 *tag, u32 affinity)
 {
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
-  clib_bihash_kv_8_8_t kv, value;
   snat_address_t *a = 0;
-  int i;
+
   nat44_lb_addr_port_t *local;
-  snat_main_per_thread_data_t *tsm;
-  snat_session_t *s;
   uword *bitmap = 0;
+  int rc = 0;
 
-  init_nat_k (&kv, e_addr, e_port, 0, proto);
-  if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
-    m = 0;
-  else
-    m = pool_elt_at_index (sm->static_mappings, value.value);
+  int i;
 
-  if (is_add)
+  if (!sm->enabled)
     {
-      if (m)
-       return VNET_API_ERROR_VALUE_EXIST;
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  m = nat44_ed_sm_o2i_lookup (sm, e_addr, e_port, 0, proto);
 
-      if (vec_len (locals) < 2)
-       return VNET_API_ERROR_INVALID_VALUE;
+  if (m)
+    {
+      return VNET_API_ERROR_VALUE_EXIST;
+    }
+
+  if (vec_len (locals) < 2)
+    {
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
 
+  if (!is_sm_out2in_only (flags))
+    {
       /* Find external address in allocated addresses and reserve port for
-         address and port pair mapping when dynamic translations enabled */
-      if (!(sm->static_mapping_only || out2in_only))
+        address and port pair mapping when dynamic translations enabled */
+      for (i = 0; i < vec_len (sm->addresses); i++)
        {
-         for (i = 0; i < vec_len (sm->addresses); i++)
+         if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
            {
-             if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
+             /* External port must be unused */
+             a = sm->addresses + i;
+             if (nat44_ed_sm_o2i_lookup (sm, a->addr, e_port, 0, proto))
                {
-                 a = sm->addresses + i;
-                 /* External port must be unused */
-                 switch (proto)
-                   {
-#define _(N, j, n, s) \
-                    case NAT_PROTOCOL_##N: \
-                      if (a->busy_##n##_port_refcounts[e_port]) \
-                        return VNET_API_ERROR_INVALID_VALUE; \
-                      ++a->busy_##n##_port_refcounts[e_port]; \
-                      if (e_port > 1024) \
-                        { \
-                          a->busy_##n##_ports++; \
-                          a->busy_##n##_ports_per_thread[get_thread_idx_by_port(e_port)]++; \
-                        } \
-                      break;
-                     foreach_nat_protocol
-#undef _
-                       default : nat_elog_info (sm, "unknown protocol");
-                     return VNET_API_ERROR_INVALID_VALUE_2;
-                   }
-                 break;
+                 return VNET_API_ERROR_VALUE_EXIST;
                }
+             break;
            }
-         /* External address must be allocated */
-         if (!a)
-           return VNET_API_ERROR_NO_SUCH_ENTRY;
        }
-
-      pool_get (sm->static_mappings, m);
-      clib_memset (m, 0, sizeof (*m));
-      m->tag = vec_dup (tag);
-      m->external_addr = e_addr;
-      m->external_port = e_port;
-      m->proto = proto;
-      m->twice_nat = twice_nat;
-      m->flags |= NAT_STATIC_MAPPING_FLAG_LB;
-      if (out2in_only)
-       m->flags |= NAT_STATIC_MAPPING_FLAG_OUT2IN_ONLY;
-      m->affinity = affinity;
-
-      if (affinity)
-       m->affinity_per_service_list_head_index =
-         nat_affinity_get_per_service_list_head_index ();
-      else
-       m->affinity_per_service_list_head_index = ~0;
-
-      init_nat_kv (&kv, m->external_addr, m->external_port, 0, m->proto, 0,
-                  m - sm->static_mappings);
-      if (clib_bihash_add_del_8_8 (&sm->static_mapping_by_external, &kv, 1))
+      // external address must be allocated
+      if (!a)
        {
-         nat_elog_err (sm, "static_mapping_by_external key add failed");
-         return VNET_API_ERROR_UNSPECIFIED;
+         return VNET_API_ERROR_NO_SUCH_ENTRY;
        }
+    }
+
+  pool_get (sm->static_mappings, m);
+  clib_memset (m, 0, sizeof (*m));
+  m->tag = vec_dup (tag);
+  m->external_addr = e_addr;
+  m->external_port = e_port;
+  m->affinity = affinity;
+  m->proto = proto;
+
+  m->flags = flags;
+  m->flags |= NAT_SM_FLAG_LB;
+
+  if (affinity)
+    m->affinity_per_service_list_head_index =
+      nat_affinity_get_per_service_list_head_index ();
+  else
+    m->affinity_per_service_list_head_index = ~0;
+
+  if (nat44_ed_sm_o2i_add (sm, m, m->external_addr, m->external_port, 0,
+                          m->proto))
+    {
+      nat_log_err ("sm o2i key add failed");
+      return VNET_API_ERROR_UNSPECIFIED;
+    }
 
-      for (i = 0; i < vec_len (locals); i++)
+  for (i = 0; i < vec_len (locals); i++)
+    {
+      locals[i].fib_index = fib_table_find_or_create_and_lock (
+       FIB_PROTOCOL_IP4, locals[i].vrf_id, sm->fib_src_low);
+      if (!is_sm_out2in_only (flags))
        {
-         locals[i].fib_index =
-           fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4,
-                                              locals[i].vrf_id,
-                                              sm->fib_src_low);
-         if (!out2in_only)
-           {
-             init_nat_kv (&kv, locals[i].addr, locals[i].port,
-                          locals[i].fib_index, m->proto, 0,
-                          m - sm->static_mappings);
-             clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv, 1);
-           }
-         locals[i].prefix = (i == 0) ? locals[i].probability :
-           (locals[i - 1].prefix + locals[i].probability);
-         pool_get (m->locals, local);
-         *local = locals[i];
-         if (sm->num_workers > 1)
+         if (nat44_ed_sm_o2i_add (sm, m, e_addr, e_port, 0, proto))
            {
-             ip4_header_t ip = {
-               .src_address = locals[i].addr,
-             };
-             bitmap = clib_bitmap_set (
-               bitmap,
-               nat44_ed_get_in2out_worker_index (0, &ip, m->fib_index, 0), 1);
+             nat_log_err ("sm o2i key add failed");
+             rc = VNET_API_ERROR_UNSPECIFIED;
+             // here we continue with add operation so that it can be safely
+             // reversed in delete path - otherwise we'd have to track what
+             // we've done and deal with partial cleanups and since bihash
+             // adds are (extremely improbable) the only points of failure,
+             // it's easier to just do it this way
            }
        }
-
-      /* Assign workers */
+      locals[i].prefix = (i == 0) ?
+                          locals[i].probability :
+                          (locals[i - 1].prefix + locals[i].probability);
+      pool_get (m->locals, local);
+      *local = locals[i];
       if (sm->num_workers > 1)
        {
-          clib_bitmap_foreach (i, bitmap)
-             {
-               vec_add1(m->workers, i);
-            }
+         ip4_header_t ip = {
+           .src_address = locals[i].addr,
+         };
+         bitmap = clib_bitmap_set (
+           bitmap, nat44_ed_get_in2out_worker_index (0, &ip, m->fib_index, 0),
+           1);
        }
     }
-  else
+
+  /* Assign workers */
+  if (sm->num_workers > 1)
     {
-      if (!m)
-       return VNET_API_ERROR_NO_SUCH_ENTRY;
+      clib_bitmap_foreach (i, bitmap)
+       {
+         vec_add1 (m->workers, i);
+       }
+    }
+
+  return rc;
+}
+
+int
+nat44_ed_del_lb_static_mapping (ip4_address_t e_addr, u16 e_port,
+                               ip_protocol_t proto, u32 flags)
+{
+  snat_main_t *sm = &snat_main;
+  snat_static_mapping_t *m;
+
+  nat44_lb_addr_port_t *local;
+  snat_main_per_thread_data_t *tsm;
+  snat_session_t *s;
+
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  m = nat44_ed_sm_o2i_lookup (sm, e_addr, e_port, 0, proto);
+  if (!m)
+    return VNET_API_ERROR_NO_SUCH_ENTRY;
 
-      if (!is_lb_static_mapping (m))
-       return VNET_API_ERROR_INVALID_VALUE;
+  if (!is_sm_lb (m->flags))
+    return VNET_API_ERROR_INVALID_VALUE;
+
+  if (nat44_ed_sm_o2i_del (sm, m->external_addr, m->external_port, 0,
+                          m->proto))
+    {
+      nat_log_err ("sm o2i key del failed");
+      return VNET_API_ERROR_UNSPECIFIED;
+    }
 
-      /* Free external address port */
-      if (!(sm->static_mapping_only || out2in_only))
+  pool_foreach (local, m->locals)
+    {
+      fib_table_unlock (local->fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
+      if (!is_sm_out2in_only (flags))
        {
-         for (i = 0; i < vec_len (sm->addresses); i++)
+         if (nat44_ed_sm_i2o_del (sm, local->addr, local->port,
+                                  local->fib_index, m->proto))
            {
-             if (sm->addresses[i].addr.as_u32 == e_addr.as_u32)
-               {
-                 a = sm->addresses + i;
-                 switch (proto)
-                   {
-#define _(N, j, n, s) \
-                    case NAT_PROTOCOL_##N: \
-                      --a->busy_##n##_port_refcounts[e_port]; \
-                      if (e_port > 1024) \
-                        { \
-                          a->busy_##n##_ports--; \
-                          a->busy_##n##_ports_per_thread[get_thread_idx_by_port(e_port)]--; \
-                        } \
-                      break;
-                     foreach_nat_protocol
-#undef _
-                       default : nat_elog_info (sm, "unknown protocol");
-                     return VNET_API_ERROR_INVALID_VALUE_2;
-                   }
-                 break;
-               }
+             nat_log_err ("sm i2o key del failed");
+             return VNET_API_ERROR_UNSPECIFIED;
            }
        }
 
-      init_nat_k (&kv, m->external_addr, m->external_port, 0, m->proto);
-      if (clib_bihash_add_del_8_8 (&sm->static_mapping_by_external, &kv, 0))
+      if (sm->num_workers > 1)
        {
-         nat_elog_err (sm, "static_mapping_by_external key del failed");
-         return VNET_API_ERROR_UNSPECIFIED;
+         ip4_header_t ip = {
+           .src_address = local->addr,
+         };
+         tsm = vec_elt_at_index (
+           sm->per_thread_data,
+           nat44_ed_get_in2out_worker_index (0, &ip, m->fib_index, 0));
        }
+      else
+       tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
 
-      pool_foreach (local, m->locals)
-      {
-          fib_table_unlock (local->fib_index, FIB_PROTOCOL_IP4,
-                            sm->fib_src_low);
-          if (!out2in_only)
-            {
-             init_nat_k (&kv, local->addr, local->port, local->fib_index,
-                         m->proto);
-             if (clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv,
-                                          0))
-               {
-                 nat_elog_err (sm, "static_mapping_by_local key del failed");
-                 return VNET_API_ERROR_UNSPECIFIED;
-               }
-           }
-
-         if (sm->num_workers > 1)
-           {
-             ip4_header_t ip = {
-               .src_address = local->addr,
-             };
-             tsm = vec_elt_at_index (
-               sm->per_thread_data,
-               nat44_ed_get_in2out_worker_index (0, &ip, m->fib_index, 0));
-           }
-         else
-           tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
-
-         /* Delete sessions */
-         pool_foreach (s, tsm->sessions)
-           {
-             if (!(is_lb_session (s)))
-               continue;
+      /* Delete sessions */
+      pool_foreach (s, tsm->sessions)
+       {
+         if (!(nat44_ed_is_lb_session (s)))
+           continue;
 
-             if ((s->in2out.addr.as_u32 != local->addr.as_u32) ||
-                 s->in2out.port != local->port)
-               continue;
+         if ((s->in2out.addr.as_u32 != local->addr.as_u32) ||
+             s->in2out.port != local->port)
+           continue;
 
-             nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
-             nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
-           }
-      }
-      if (m->affinity)
-       nat_affinity_flush_service (m->affinity_per_service_list_head_index);
-      pool_free (m->locals);
-      vec_free (m->tag);
-      vec_free (m->workers);
+         nat44_ed_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
+         nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
+       }
+    }
 
-      pool_put (sm->static_mappings, m);
+  if (m->affinity)
+    {
+      nat_affinity_flush_service (m->affinity_per_service_list_head_index);
     }
 
+  pool_free (m->locals);
+  vec_free (m->tag);
+  vec_free (m->workers);
+  pool_put (sm->static_mappings, m);
+
   return 0;
 }
 
 int
-nat44_lb_static_mapping_add_del_local (ip4_address_t e_addr, u16 e_port,
-                                      ip4_address_t l_addr, u16 l_port,
-                                      nat_protocol_t proto, u32 vrf_id,
-                                      u8 probability, u8 is_add)
+nat44_ed_add_del_lb_static_mapping_local (ip4_address_t e_addr, u16 e_port,
+                                         ip4_address_t l_addr, u16 l_port,
+                                         ip_protocol_t proto, u32 vrf_id,
+                                         u8 probability, u8 is_add)
 {
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m = 0;
-  clib_bihash_kv_8_8_t kv, value;
   nat44_lb_addr_port_t *local, *prev_local, *match_local = 0;
   snat_main_per_thread_data_t *tsm;
   snat_session_t *s;
@@ -1096,15 +1415,22 @@ nat44_lb_static_mapping_add_del_local (ip4_address_t e_addr, u16 e_port,
   uword *bitmap = 0;
   int i;
 
-  init_nat_k (&kv, e_addr, e_port, 0, proto);
-  if (!clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
-    m = pool_elt_at_index (sm->static_mappings, value.value);
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  m = nat44_ed_sm_o2i_lookup (sm, e_addr, e_port, 0, proto);
 
   if (!m)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
+    {
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
 
-  if (!is_lb_static_mapping (m))
-    return VNET_API_ERROR_INVALID_VALUE;
+  if (!is_sm_lb (m->flags))
+    {
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
 
   pool_foreach (local, m->locals)
    {
@@ -1119,7 +1445,9 @@ nat44_lb_static_mapping_add_del_local (ip4_address_t e_addr, u16 e_port,
   if (is_add)
     {
       if (match_local)
-       return VNET_API_ERROR_VALUE_EXIST;
+       {
+         return VNET_API_ERROR_VALUE_EXIST;
+       }
 
       pool_get (m->locals, local);
       clib_memset (local, 0, sizeof (*local));
@@ -1131,12 +1459,15 @@ nat44_lb_static_mapping_add_del_local (ip4_address_t e_addr, u16 e_port,
        fib_table_find_or_create_and_lock (FIB_PROTOCOL_IP4, vrf_id,
                                           sm->fib_src_low);
 
-      if (!is_out2in_only_static_mapping (m))
+      if (!is_sm_out2in_only (m->flags))
        {
-         init_nat_kv (&kv, l_addr, l_port, local->fib_index, proto, 0,
-                      m - sm->static_mappings);
-         if (clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv, 1))
-           nat_elog_err (sm, "static_mapping_by_local key add failed");
+         if (nat44_ed_sm_i2o_add (sm, m, l_addr, l_port, local->fib_index,
+                                  proto))
+           {
+             nat_log_err ("sm i2o key add failed");
+             pool_put (m->locals, local);
+             return VNET_API_ERROR_UNSPECIFIED;
+           }
        }
     }
   else
@@ -1150,11 +1481,11 @@ nat44_lb_static_mapping_add_del_local (ip4_address_t e_addr, u16 e_port,
       fib_table_unlock (match_local->fib_index, FIB_PROTOCOL_IP4,
                        sm->fib_src_low);
 
-      if (!is_out2in_only_static_mapping (m))
+      if (!is_sm_out2in_only (m->flags))
        {
-         init_nat_k (&kv, l_addr, l_port, match_local->fib_index, proto);
-         if (clib_bihash_add_del_8_8 (&sm->static_mapping_by_local, &kv, 0))
-           nat_elog_err (sm, "static_mapping_by_local key del failed");
+         if (nat44_ed_sm_i2o_del (sm, l_addr, l_port, match_local->fib_index,
+                                  proto))
+           nat_log_err ("sm i2o key del failed");
        }
 
       if (sm->num_workers > 1)
@@ -1169,169 +1500,53 @@ nat44_lb_static_mapping_add_del_local (ip4_address_t e_addr, u16 e_port,
       else
        tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
 
-      /* Delete sessions */
-      pool_foreach (s, tsm->sessions) {
-        if (!(is_lb_session (s)))
-          continue;
-
-        if ((s->in2out.addr.as_u32 != match_local->addr.as_u32) ||
-            s->in2out.port != match_local->port)
-          continue;
-
-        nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
-        nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
-      }
-
-      pool_put (m->locals, match_local);
-    }
-
-  vec_free (m->workers);
-
-  pool_foreach (local, m->locals)
-   {
-    vec_add1 (locals, local - m->locals);
-    if (sm->num_workers > 1)
-      {
-        ip4_header_t ip;
-       ip.src_address.as_u32 = local->addr.as_u32,
-       bitmap = clib_bitmap_set (
-         bitmap,
-         nat44_ed_get_in2out_worker_index (0, &ip, local->fib_index, 0), 1);
-      }
-  }
-
-  ASSERT (vec_len (locals) > 1);
-
-  local = pool_elt_at_index (m->locals, locals[0]);
-  local->prefix = local->probability;
-  for (i = 1; i < vec_len (locals); i++)
-    {
-      local = pool_elt_at_index (m->locals, locals[i]);
-      prev_local = pool_elt_at_index (m->locals, locals[i - 1]);
-      local->prefix = local->probability + prev_local->prefix;
-    }
-
-  /* Assign workers */
-  if (sm->num_workers > 1)
-    {
-      clib_bitmap_foreach (i, bitmap)  { vec_add1(m->workers, i); }
-    }
-
-  return 0;
-}
-
-int
-snat_del_address (snat_main_t * sm, ip4_address_t addr, u8 delete_sm,
-                 u8 twice_nat)
-{
-  snat_address_t *a = 0;
-  snat_session_t *ses;
-  u32 *ses_to_be_removed = 0, *ses_index;
-  snat_main_per_thread_data_t *tsm;
-  snat_static_mapping_t *m;
-  snat_interface_t *interface;
-  int i;
-  snat_address_t *addresses =
-    twice_nat ? sm->twice_nat_addresses : sm->addresses;
-
-  /* Find SNAT address */
-  for (i = 0; i < vec_len (addresses); i++)
-    {
-      if (addresses[i].addr.as_u32 == addr.as_u32)
-       {
-         a = addresses + i;
-         break;
-       }
-    }
-  if (!a)
-    {
-      nat_log_err ("no such address");
-      return VNET_API_ERROR_NO_SUCH_ENTRY;
-    }
-
-  if (delete_sm)
-    {
-      ip4_address_t pool_addr = { 0 };
-      pool_foreach (m, sm->static_mappings)
-       {
-          if (m->external_addr.as_u32 == addr.as_u32)
-            (void) snat_add_static_mapping (m->local_addr, m->external_addr,
-                                            m->local_port, m->external_port,
-                                            m->vrf_id,
-                                            is_addr_only_static_mapping(m), ~0,
-                                            m->proto, 0 /* is_add */,
-                                            m->twice_nat,
-                                            is_out2in_only_static_mapping(m),
-                                            m->tag,
-                                            is_identity_static_mapping(m),
-                                            pool_addr, 0);
-      }
-    }
-  else
-    {
-      /* Check if address is used in some static mapping */
-      if (is_snat_address_used_in_static_mapping (sm, addr))
-       {
-         nat_log_err ("address used in static mapping");
-         return VNET_API_ERROR_UNSPECIFIED;
-       }
-    }
-
-  if (a->fib_index != ~0)
-    fib_table_unlock (a->fib_index, FIB_PROTOCOL_IP4, sm->fib_src_low);
-
-  /* Delete sessions using address */
-  if (a->busy_tcp_ports || a->busy_udp_ports || a->busy_icmp_ports)
-    {
-      vec_foreach (tsm, sm->per_thread_data)
-      {
-        pool_foreach (ses, tsm->sessions)  {
-          if (ses->out2in.addr.as_u32 == addr.as_u32)
-            {
-              nat_free_session_data (sm, ses, tsm - sm->per_thread_data, 0);
-              vec_add1 (ses_to_be_removed, ses - tsm->sessions);
-            }
-        }
+      /* Delete sessions */
+      pool_foreach (s, tsm->sessions) {
+         if (!(nat44_ed_is_lb_session (s)))
+           continue;
 
-           vec_foreach (ses_index, ses_to_be_removed)
-           {
-             ses = pool_elt_at_index (tsm->sessions, ses_index[0]);
-             nat_ed_session_delete (sm, ses, tsm - sm->per_thread_data, 1);
-           }
+         if ((s->in2out.addr.as_u32 != match_local->addr.as_u32) ||
+             s->in2out.port != match_local->port)
+           continue;
 
-       vec_free (ses_to_be_removed);
+         nat44_ed_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
+         nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
       }
+
+      pool_put (m->locals, match_local);
     }
 
-#define _(N, i, n, s) \
-  vec_free (a->busy_##n##_ports_per_thread);
-  foreach_nat_protocol
-#undef _
+  vec_free (m->workers);
 
-    if (twice_nat)
-  {
-    vec_del1 (sm->twice_nat_addresses, i);
-    return 0;
+  pool_foreach (local, m->locals)
+   {
+    vec_add1 (locals, local - m->locals);
+    if (sm->num_workers > 1)
+      {
+        ip4_header_t ip;
+       ip.src_address.as_u32 = local->addr.as_u32,
+       bitmap = clib_bitmap_set (
+         bitmap,
+         nat44_ed_get_in2out_worker_index (0, &ip, local->fib_index, 0), 1);
+      }
   }
-  else vec_del1 (sm->addresses, i);
 
-  /* Delete external address from FIB */
-  pool_foreach (interface, sm->interfaces)
-    {
-      if (nat_interface_is_inside (interface))
-       continue;
+  ASSERT (vec_len (locals) > 1);
 
-      snat_add_del_addr_to_fib (&addr, 32, interface->sw_if_index, 0);
-      break;
+  local = pool_elt_at_index (m->locals, locals[0]);
+  local->prefix = local->probability;
+  for (i = 1; i < vec_len (locals); i++)
+    {
+      local = pool_elt_at_index (m->locals, locals[i]);
+      prev_local = pool_elt_at_index (m->locals, locals[i - 1]);
+      local->prefix = local->probability + prev_local->prefix;
     }
-  pool_foreach (interface, sm->output_feature_interfaces)
-   {
-     if (nat_interface_is_inside (interface))
-       continue;
 
-     snat_add_del_addr_to_fib (&addr, 32, interface->sw_if_index, 0);
-     break;
-  }
+  /* Assign workers */
+  if (sm->num_workers > 1)
+    {
+      clib_bitmap_foreach (i, bitmap)  { vec_add1(m->workers, i); }
+    }
 
   return 0;
 }
@@ -1393,17 +1608,44 @@ update_per_vrf_sessions_vec (u32 fib_index, int is_del)
     }
 }
 
+static_always_inline nat_outside_fib_t *
+nat44_ed_get_outside_fib (nat_outside_fib_t *outside_fibs, u32 fib_index)
+{
+  nat_outside_fib_t *f;
+  vec_foreach (f, outside_fibs)
+    {
+      if (f->fib_index == fib_index)
+       {
+         return f;
+       }
+    }
+  return 0;
+}
+
+static_always_inline snat_interface_t *
+nat44_ed_get_interface (snat_interface_t *interfaces, u32 sw_if_index)
+{
+  snat_interface_t *i;
+  pool_foreach (i, interfaces)
+    {
+      if (i->sw_if_index == sw_if_index)
+       {
+         return i;
+       }
+    }
+  return 0;
+}
+
 int
-snat_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del)
+nat44_ed_add_interface (u32 sw_if_index, u8 is_inside)
 {
+  const char *del_feature_name, *feature_name;
   snat_main_t *sm = &snat_main;
-  snat_interface_t *i;
-  const char *feature_name, *del_feature_name;
-  snat_address_t *ap;
-  snat_static_mapping_t *m;
+
   nat_outside_fib_t *outside_fib;
-  u32 fib_index = fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-                                                      sw_if_index);
+  snat_interface_t *i;
+  u32 fib_index;
+  int rv;
 
   if (!sm->enabled)
     {
@@ -1411,197 +1653,313 @@ snat_interface_add_del (u32 sw_if_index, u8 is_inside, int is_del)
       return VNET_API_ERROR_UNSUPPORTED;
     }
 
-  pool_foreach (i, sm->output_feature_interfaces)
-   {
-    if (i->sw_if_index == sw_if_index)
-      {
-        nat_log_err ("error interface already configured");
-        return VNET_API_ERROR_VALUE_EXIST;
-      }
-  }
+  if (nat44_ed_get_interface (sm->output_feature_interfaces, sw_if_index))
+    {
+      nat_log_err ("error interface already configured");
+      return VNET_API_ERROR_VALUE_EXIST;
+    }
 
-  if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking))
-    feature_name = is_inside ? "nat44-in2out-fast" : "nat44-out2in-fast";
-  else
+  i = nat44_ed_get_interface (sm->interfaces, sw_if_index);
+  if (i)
     {
+      if ((nat44_ed_is_interface_inside (i) && is_inside) ||
+         (nat44_ed_is_interface_outside (i) && !is_inside))
+       {
+         return 0;
+       }
       if (sm->num_workers > 1)
-       feature_name =
-         is_inside ? "nat44-in2out-worker-handoff" :
-         "nat44-out2in-worker-handoff";
+       {
+         del_feature_name = !is_inside ? "nat44-in2out-worker-handoff" :
+                                         "nat44-out2in-worker-handoff";
+         feature_name = "nat44-handoff-classify";
+       }
       else
-       feature_name = is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
+       {
+         del_feature_name = !is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
+
+         feature_name = "nat44-ed-classify";
+       }
+
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 1);
+      if (rv)
+       return rv;
+      vnet_feature_enable_disable ("ip4-unicast", del_feature_name,
+                                  sw_if_index, 0, 0, 0);
+      vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index, 1,
+                                  0, 0);
     }
+  else
+    {
+      if (sm->num_workers > 1)
+       {
+         feature_name = is_inside ? "nat44-in2out-worker-handoff" :
+                                    "nat44-out2in-worker-handoff";
+       }
+      else
+       {
+         feature_name = is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
+       }
 
-  ASSERT (sm->frame_queue_nelts > 0);
+      nat_validate_interface_counters (sm, sw_if_index);
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 1);
+      if (rv)
+       return rv;
+      vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index, 1,
+                                  0, 0);
 
-  if (sm->fq_in2out_index == ~0 && sm->num_workers > 1)
-    sm->fq_in2out_index = vlib_frame_queue_main_init (sm->in2out_node_index,
-                                                     sm->frame_queue_nelts);
+      pool_get (sm->interfaces, i);
+      i->sw_if_index = sw_if_index;
+      i->flags = 0;
+    }
 
-  if (sm->fq_out2in_index == ~0 && sm->num_workers > 1)
-    sm->fq_out2in_index = vlib_frame_queue_main_init (sm->out2in_node_index,
-                                                     sm->frame_queue_nelts);
+  fib_index =
+    fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index);
 
-  update_per_vrf_sessions_vec (fib_index, is_del);
+  update_per_vrf_sessions_vec (fib_index, 0 /*is_del*/);
 
   if (!is_inside)
     {
-      vec_foreach (outside_fib, sm->outside_fibs)
-        {
-          if (outside_fib->fib_index == fib_index)
-            {
-              if (is_del)
-                {
-                 outside_fib->refcount--;
-                  if (!outside_fib->refcount)
-                    vec_del1 (sm->outside_fibs, outside_fib - sm->outside_fibs);
-                }
-              else
-                outside_fib->refcount++;
-              goto feature_set;
-            }
-        }
-      if (!is_del)
+      i->flags |= NAT_INTERFACE_FLAG_IS_OUTSIDE;
+
+      outside_fib = nat44_ed_get_outside_fib (sm->outside_fibs, fib_index);
+      if (outside_fib)
+       {
+         outside_fib->refcount++;
+       }
+      else
        {
          vec_add2 (sm->outside_fibs, outside_fib, 1);
-         outside_fib->refcount = 1;
          outside_fib->fib_index = fib_index;
+         outside_fib->refcount = 1;
        }
-    }
 
-feature_set:
-  pool_foreach (i, sm->interfaces)
-   {
-    if (i->sw_if_index == sw_if_index)
-      {
-        if (is_del)
-          {
-            if (nat_interface_is_inside(i) && nat_interface_is_outside(i))
-              {
-                if (is_inside)
-                  i->flags &= ~NAT_INTERFACE_FLAG_IS_INSIDE;
-                else
-                  i->flags &= ~NAT_INTERFACE_FLAG_IS_OUTSIDE;
-
-                if (sm->num_workers > 1)
-                  {
-                    del_feature_name = "nat44-handoff-classify";
-                    feature_name = !is_inside ?  "nat44-in2out-worker-handoff" :
-                                                 "nat44-out2in-worker-handoff";
-                  }
-               else
-                 {
-                   del_feature_name = "nat44-ed-classify";
-                   feature_name =
-                     !is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
-                 }
+      nat44_ed_add_del_nat_addr_fib_reg_entries (sw_if_index, 1);
+      nat44_ed_add_del_sm_fib_reg_entries (sw_if_index, 1);
 
-               int rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 0);
-               if (rv)
-                 return rv;
-                vnet_feature_enable_disable ("ip4-unicast", del_feature_name,
-                                             sw_if_index, 0, 0, 0);
-                vnet_feature_enable_disable ("ip4-unicast", feature_name,
-                                             sw_if_index, 1, 0, 0);
-             }
-           else
-             {
-               int rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 0);
-               if (rv)
-                 return rv;
-                vnet_feature_enable_disable ("ip4-unicast", feature_name,
-                                             sw_if_index, 0, 0, 0);
-                pool_put (sm->interfaces, i);
-             }
-         }
-       else
-         {
-           if ((nat_interface_is_inside (i) && is_inside) ||
-               (nat_interface_is_outside (i) && !is_inside))
-             return 0;
+      nat44_ed_bind_if_addr_to_nat_addr (sw_if_index);
+    }
+  else
+    {
+      i->flags |= NAT_INTERFACE_FLAG_IS_INSIDE;
+    }
 
-           if (sm->num_workers > 1)
-             {
-               del_feature_name = !is_inside ? "nat44-in2out-worker-handoff" :
-                                               "nat44-out2in-worker-handoff";
-               feature_name = "nat44-handoff-classify";
-             }
-           else
-             {
-               del_feature_name =
-                 !is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
+  return 0;
+}
 
-               feature_name = "nat44-ed-classify";
-             }
+int
+nat44_ed_del_interface (u32 sw_if_index, u8 is_inside)
+{
+  const char *del_feature_name, *feature_name;
+  snat_main_t *sm = &snat_main;
 
-           int rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 1);
-           if (rv)
-             return rv;
-            vnet_feature_enable_disable ("ip4-unicast", del_feature_name,
-                                         sw_if_index, 0, 0, 0);
-            vnet_feature_enable_disable ("ip4-unicast", feature_name,
-                                         sw_if_index, 1, 0, 0);
-           goto set_flags;
-         }
+  nat_outside_fib_t *outside_fib;
+  snat_interface_t *i;
+  u32 fib_index;
+  int rv;
 
-       goto fib;
-      }
-  }
+  if (!sm->enabled)
+    {
+      nat_log_err ("nat44 is disabled");
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
 
-  if (is_del)
+  i = nat44_ed_get_interface (sm->interfaces, sw_if_index);
+  if (i == 0)
     {
       nat_log_err ("error interface couldn't be found");
       return VNET_API_ERROR_NO_SUCH_ENTRY;
     }
 
-  pool_get (sm->interfaces, i);
-  i->sw_if_index = sw_if_index;
-  i->flags = 0;
-  nat_validate_interface_counters (sm, sw_if_index);
+  if (nat44_ed_is_interface_inside (i) && nat44_ed_is_interface_outside (i))
+    {
+      if (sm->num_workers > 1)
+       {
+         del_feature_name = "nat44-handoff-classify";
+         feature_name = !is_inside ? "nat44-in2out-worker-handoff" :
+                                     "nat44-out2in-worker-handoff";
+       }
+      else
+       {
+         del_feature_name = "nat44-ed-classify";
+         feature_name = !is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
+       }
+
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 0);
+      if (rv)
+       {
+         return rv;
+       }
+      vnet_feature_enable_disable ("ip4-unicast", del_feature_name,
+                                  sw_if_index, 0, 0, 0);
+      vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index, 1,
+                                  0, 0);
+
+      if (is_inside)
+       {
+         i->flags &= ~NAT_INTERFACE_FLAG_IS_INSIDE;
+       }
+      else
+       {
+         i->flags &= ~NAT_INTERFACE_FLAG_IS_OUTSIDE;
+       }
+    }
+  else
+    {
+      if (sm->num_workers > 1)
+       {
+         feature_name = is_inside ? "nat44-in2out-worker-handoff" :
+                                    "nat44-out2in-worker-handoff";
+       }
+      else
+       {
+         feature_name = is_inside ? "nat-pre-in2out" : "nat-pre-out2in";
+       }
+
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 0);
+      if (rv)
+       {
+         return rv;
+       }
+      vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index, 0,
+                                  0, 0);
 
-  vnet_feature_enable_disable ("ip4-unicast", feature_name, sw_if_index, 1, 0,
-                              0);
+      // remove interface
+      pool_put (sm->interfaces, i);
+    }
+
+  fib_index =
+    fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index);
 
-  int rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 1);
-  if (rv)
-    return rv;
+  update_per_vrf_sessions_vec (fib_index, 1 /*is_del*/);
 
-set_flags:
-  if (is_inside)
+  if (!is_inside)
     {
-      i->flags |= NAT_INTERFACE_FLAG_IS_INSIDE;
-      return 0;
+      outside_fib = nat44_ed_get_outside_fib (sm->outside_fibs, fib_index);
+      if (outside_fib)
+       {
+         outside_fib->refcount--;
+         if (!outside_fib->refcount)
+           {
+             vec_del1 (sm->outside_fibs, outside_fib - sm->outside_fibs);
+           }
+       }
+
+      nat44_ed_add_del_nat_addr_fib_reg_entries (sw_if_index, 0);
+      nat44_ed_add_del_sm_fib_reg_entries (sw_if_index, 0);
+    }
+
+  return 0;
+}
+
+int
+nat44_ed_add_output_interface (u32 sw_if_index)
+{
+  snat_main_t *sm = &snat_main;
+
+  nat_outside_fib_t *outside_fib;
+  snat_interface_t *i;
+  u32 fib_index;
+  int rv;
+
+  if (!sm->enabled)
+    {
+      nat_log_err ("nat44 is disabled");
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  if (nat44_ed_get_interface (sm->interfaces, sw_if_index))
+    {
+      nat_log_err ("error interface already configured");
+      return VNET_API_ERROR_VALUE_EXIST;
+    }
+
+  if (nat44_ed_get_interface (sm->output_feature_interfaces, sw_if_index))
+    {
+      nat_log_err ("error interface already configured");
+      return VNET_API_ERROR_VALUE_EXIST;
+    }
+
+  if (sm->num_workers > 1)
+    {
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 1);
+      if (rv)
+       {
+         return rv;
+       }
+
+      rv = ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index, 1);
+      if (rv)
+       {
+         return rv;
+       }
+
+      vnet_feature_enable_disable (
+       "ip4-unicast", "nat44-out2in-worker-handoff", sw_if_index, 1, 0, 0);
+      vnet_feature_enable_disable ("ip4-output",
+                                  "nat44-in2out-output-worker-handoff",
+                                  sw_if_index, 1, 0, 0);
     }
   else
-    i->flags |= NAT_INTERFACE_FLAG_IS_OUTSIDE;
+    {
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 1);
+      if (rv)
+       {
+         return rv;
+       }
 
-  /* Add/delete external addresses to FIB */
-fib:
-  vec_foreach (ap, sm->addresses)
-    snat_add_del_addr_to_fib(&ap->addr, 32, sw_if_index, !is_del);
+      rv = ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index, 1);
+      if (rv)
+       {
+         return rv;
+       }
 
-  pool_foreach (m, sm->static_mappings)
-   {
-    if (!(is_addr_only_static_mapping(m)) || (m->local_addr.as_u32 == m->external_addr.as_u32))
-      continue;
+      vnet_feature_enable_disable ("ip4-unicast", "nat-pre-out2in",
+                                  sw_if_index, 1, 0, 0);
+      vnet_feature_enable_disable ("ip4-output", "nat-pre-in2out-output",
+                                  sw_if_index, 1, 0, 0);
+    }
 
-    snat_add_del_addr_to_fib(&m->external_addr, 32, sw_if_index, !is_del);
-  }
+  nat_validate_interface_counters (sm, sw_if_index);
+
+  pool_get (sm->output_feature_interfaces, i);
+  i->sw_if_index = sw_if_index;
+  i->flags = 0;
+  i->flags |= NAT_INTERFACE_FLAG_IS_INSIDE;
+  i->flags |= NAT_INTERFACE_FLAG_IS_OUTSIDE;
+
+  fib_index =
+    fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index);
+  update_per_vrf_sessions_vec (fib_index, 0 /*is_del*/);
+
+  outside_fib = nat44_ed_get_outside_fib (sm->outside_fibs, fib_index);
+  if (outside_fib)
+    {
+      outside_fib->refcount++;
+    }
+  else
+    {
+      vec_add2 (sm->outside_fibs, outside_fib, 1);
+      outside_fib->fib_index = fib_index;
+      outside_fib->refcount = 1;
+    }
+
+  nat44_ed_add_del_nat_addr_fib_reg_entries (sw_if_index, 1);
+  nat44_ed_add_del_sm_fib_reg_entries (sw_if_index, 1);
+
+  nat44_ed_bind_if_addr_to_nat_addr (sw_if_index);
 
   return 0;
 }
 
 int
-snat_interface_add_del_output_feature (u32 sw_if_index,
-                                      u8 is_inside, int is_del)
+nat44_ed_del_output_interface (u32 sw_if_index)
 {
   snat_main_t *sm = &snat_main;
-  snat_interface_t *i;
-  snat_address_t *ap;
-  snat_static_mapping_t *m;
+
   nat_outside_fib_t *outside_fib;
-  u32 fib_index = fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
-                                                      sw_if_index);
+  snat_interface_t *i;
+  u32 fib_index;
+  int rv;
 
   if (!sm->enabled)
     {
@@ -1609,148 +1967,72 @@ snat_interface_add_del_output_feature (u32 sw_if_index,
       return VNET_API_ERROR_UNSUPPORTED;
     }
 
-  if (sm->static_mapping_only && !(sm->static_mapping_connection_tracking))
+  i = nat44_ed_get_interface (sm->output_feature_interfaces, sw_if_index);
+  if (!i)
     {
-      nat_log_err ("error unsupported");
-      return VNET_API_ERROR_UNSUPPORTED;
+      nat_log_err ("error interface couldn't be found");
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
     }
 
-  pool_foreach (i, sm->interfaces)
-   {
-    if (i->sw_if_index == sw_if_index)
-      {
-        nat_log_err ("error interface already configured");
-        return VNET_API_ERROR_VALUE_EXIST;
-      }
-  }
-
-  update_per_vrf_sessions_vec (fib_index, is_del);
-
-  if (!is_inside)
+  if (sm->num_workers > 1)
     {
-      vec_foreach (outside_fib, sm->outside_fibs)
-        {
-          if (outside_fib->fib_index == fib_index)
-            {
-              if (is_del)
-                {
-                 outside_fib->refcount--;
-                  if (!outside_fib->refcount)
-                    vec_del1 (sm->outside_fibs, outside_fib - sm->outside_fibs);
-                }
-              else
-                outside_fib->refcount++;
-              goto feature_set;
-            }
-        }
-      if (!is_del)
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 0);
+      if (rv)
        {
-         vec_add2 (sm->outside_fibs, outside_fib, 1);
-         outside_fib->refcount = 1;
-         outside_fib->fib_index = fib_index;
+         return rv;
        }
-    }
-
-feature_set:
-  if (is_inside)
-    {
-         int rv =
-           ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, !is_del);
-         if (rv)
-           return rv;
-         rv =
-           ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index,
-                                                           !is_del);
-         if (rv)
-           return rv;
-      goto fq;
-    }
 
-  if (sm->num_workers > 1)
-    {
-      int rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, !is_del);
-      if (rv)
-       return rv;
-      rv =
-       ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index, !is_del);
+      rv = ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index, 0);
       if (rv)
-       return rv;
-      vnet_feature_enable_disable ("ip4-unicast",
-                                  "nat44-out2in-worker-handoff",
-                                  sw_if_index, !is_del, 0, 0);
+       {
+         return rv;
+       }
+
+      vnet_feature_enable_disable (
+       "ip4-unicast", "nat44-out2in-worker-handoff", sw_if_index, 0, 0, 0);
       vnet_feature_enable_disable ("ip4-output",
                                   "nat44-in2out-output-worker-handoff",
-                                  sw_if_index, !is_del, 0, 0);
+                                  sw_if_index, 0, 0, 0);
     }
   else
     {
-         int rv =
-           ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, !is_del);
-         if (rv)
-           return rv;
-         rv =
-           ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index,
-                                                           !is_del);
-         if (rv)
-           return rv;
-         vnet_feature_enable_disable ("ip4-unicast", "nat-pre-out2in",
-                                      sw_if_index, !is_del, 0, 0);
-         vnet_feature_enable_disable ("ip4-output", "nat-pre-in2out-output",
-                                      sw_if_index, !is_del, 0, 0);
-    }
-
-fq:
-  if (sm->fq_in2out_output_index == ~0 && sm->num_workers > 1)
-    sm->fq_in2out_output_index =
-      vlib_frame_queue_main_init (sm->in2out_output_node_index, 0);
-
-  if (sm->fq_out2in_index == ~0 && sm->num_workers > 1)
-    sm->fq_out2in_index =
-      vlib_frame_queue_main_init (sm->out2in_node_index, 0);
-
-  pool_foreach (i, sm->output_feature_interfaces)
-   {
-    if (i->sw_if_index == sw_if_index)
-      {
-        if (is_del)
-          pool_put (sm->output_feature_interfaces, i);
-        else
-          return VNET_API_ERROR_VALUE_EXIST;
+      rv = ip4_sv_reass_enable_disable_with_refcnt (sw_if_index, 0);
+      if (rv)
+       {
+         return rv;
+       }
 
-        goto fib;
-      }
-  }
+      rv = ip4_sv_reass_output_enable_disable_with_refcnt (sw_if_index, 0);
+      if (rv)
+       {
+         return rv;
+       }
 
-  if (is_del)
-    {
-      nat_log_err ("error interface couldn't be found");
-      return VNET_API_ERROR_NO_SUCH_ENTRY;
+      vnet_feature_enable_disable ("ip4-unicast", "nat-pre-out2in",
+                                  sw_if_index, 0, 0, 0);
+      vnet_feature_enable_disable ("ip4-output", "nat-pre-in2out-output",
+                                  sw_if_index, 0, 0, 0);
     }
 
-  pool_get (sm->output_feature_interfaces, i);
-  i->sw_if_index = sw_if_index;
-  i->flags = 0;
-  nat_validate_interface_counters (sm, sw_if_index);
-  if (is_inside)
-    i->flags |= NAT_INTERFACE_FLAG_IS_INSIDE;
-  else
-    i->flags |= NAT_INTERFACE_FLAG_IS_OUTSIDE;
-
-  /* Add/delete external addresses to FIB */
-fib:
-  if (is_inside)
-    return 0;
+  // remove interface
+  pool_put (sm->output_feature_interfaces, i);
 
-  vec_foreach (ap, sm->addresses)
-    snat_add_del_addr_to_fib(&ap->addr, 32, sw_if_index, !is_del);
+  fib_index =
+    fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4, sw_if_index);
+  update_per_vrf_sessions_vec (fib_index, 1 /*is_del*/);
 
-  pool_foreach (m, sm->static_mappings)
-   {
-    if (!((is_addr_only_static_mapping(m)))  || (m->local_addr.as_u32 == m->external_addr.as_u32))
-      continue;
+  outside_fib = nat44_ed_get_outside_fib (sm->outside_fibs, fib_index);
+  if (outside_fib)
+    {
+      outside_fib->refcount--;
+      if (!outside_fib->refcount)
+       {
+         vec_del1 (sm->outside_fibs, outside_fib - sm->outside_fibs);
+       }
+    }
 
-    snat_add_del_addr_to_fib(&m->external_addr, 32, sw_if_index, !is_del);
-  }
+  nat44_ed_add_del_nat_addr_fib_reg_entries (sw_if_index, 0);
+  nat44_ed_add_del_sm_fib_reg_entries (sw_if_index, 0);
 
   return 0;
 }
@@ -1791,9 +2073,8 @@ nat44_ed_set_frame_queue_nelts (u32 frame_queue_nelts)
 }
 
 static void
-snat_update_outside_fib (ip4_main_t * im, uword opaque,
-                        u32 sw_if_index, u32 new_fib_index,
-                        u32 old_fib_index)
+nat44_ed_update_outside_fib_cb (ip4_main_t *im, uword opaque, u32 sw_if_index,
+                               u32 new_fib_index, u32 old_fib_index)
 {
   snat_main_t *sm = &snat_main;
   nat_outside_fib_t *outside_fib;
@@ -1808,20 +2089,20 @@ snat_update_outside_fib (ip4_main_t * im, uword opaque,
     }
 
   pool_foreach (i, sm->interfaces)
-     {
+    {
       if (i->sw_if_index == sw_if_index)
         {
-          if (!(nat_interface_is_outside (i)))
+         if (!(nat44_ed_is_interface_outside (i)))
            return;
           match = 1;
         }
     }
 
   pool_foreach (i, sm->output_feature_interfaces)
-     {
+    {
       if (i->sw_if_index == sw_if_index)
         {
-          if (!(nat_interface_is_outside (i)))
+         if (!(nat44_ed_is_interface_outside (i)))
            return;
           match = 1;
         }
@@ -1831,25 +2112,25 @@ snat_update_outside_fib (ip4_main_t * im, uword opaque,
     return;
 
   vec_foreach (outside_fib, sm->outside_fibs)
-  {
-    if (outside_fib->fib_index == old_fib_index)
-      {
-       outside_fib->refcount--;
-       if (!outside_fib->refcount)
-         vec_del1 (sm->outside_fibs, outside_fib - sm->outside_fibs);
-       break;
-      }
-  }
+    {
+      if (outside_fib->fib_index == old_fib_index)
+       {
+         outside_fib->refcount--;
+         if (!outside_fib->refcount)
+           vec_del1 (sm->outside_fibs, outside_fib - sm->outside_fibs);
+         break;
+       }
+    }
 
   vec_foreach (outside_fib, sm->outside_fibs)
-  {
-    if (outside_fib->fib_index == new_fib_index)
-      {
-       outside_fib->refcount++;
-       is_add = 0;
-       break;
-      }
-  }
+    {
+      if (outside_fib->fib_index == new_fib_index)
+       {
+         outside_fib->refcount++;
+         is_add = 0;
+         break;
+       }
+    }
 
   if (is_add)
     {
@@ -1859,26 +2140,17 @@ snat_update_outside_fib (ip4_main_t * im, uword opaque,
     }
 }
 
-static void
-snat_update_outside_fib (ip4_main_t * im, uword opaque,
-                        u32 sw_if_index, u32 new_fib_index,
-                        u32 old_fib_index);
+static void nat44_ed_update_outside_fib_cb (ip4_main_t *im, uword opaque,
+                                           u32 sw_if_index, u32 new_fib_index,
+                                           u32 old_fib_index);
 
-static void
-snat_ip4_add_del_interface_address_cb (ip4_main_t * im,
-                                      uword opaque,
-                                      u32 sw_if_index,
-                                      ip4_address_t * address,
-                                      u32 address_length,
-                                      u32 if_address_index, u32 is_delete);
+static void nat44_ed_add_del_interface_address_cb (
+  ip4_main_t *im, uword opaque, u32 sw_if_index, ip4_address_t *address,
+  u32 address_length, u32 if_address_index, u32 is_delete);
 
-static void
-nat_ip4_add_del_addr_only_sm_cb (ip4_main_t * im,
-                                uword opaque,
-                                u32 sw_if_index,
-                                ip4_address_t * address,
-                                u32 address_length,
-                                u32 if_address_index, u32 is_delete);
+static void nat44_ed_add_del_static_mapping_cb (
+  ip4_main_t *im, uword opaque, u32 sw_if_index, ip4_address_t *address,
+  u32 address_length, u32 if_address_index, u32 is_delete);
 
 void
 test_key_calc_split ()
@@ -1900,8 +2172,8 @@ test_key_calc_split ()
   u32 thread_index = 3000000001;
   u32 session_index = 3000000221;
   clib_bihash_kv_16_8_t kv;
-  init_ed_kv (&kv, l_addr, l_port, r_addr, r_port, fib_index, proto,
-             thread_index, session_index);
+  init_ed_kv (&kv, l_addr.as_u32, l_port, r_addr.as_u32, r_port, fib_index,
+             proto, thread_index, session_index);
   ip4_address_t l_addr2;
   ip4_address_t r_addr2;
   clib_memset (&l_addr2, 0, sizeof (l_addr2));
@@ -1920,30 +2192,20 @@ test_key_calc_split ()
   ASSERT (fib_index == fib_index2);
   ASSERT (thread_index == ed_value_get_thread_index (&kv));
   ASSERT (session_index == ed_value_get_session_index (&kv));
-
-  fib_index = 7001;
-  proto = 5;
-  nat_protocol_t proto3 = ~0;
-  u64 key = calc_nat_key (l_addr, l_port, fib_index, proto);
-  split_nat_key (key, &l_addr2, &l_port2, &fib_index2, &proto3);
-  ASSERT (l_addr.as_u32 == l_addr2.as_u32);
-  ASSERT (l_port == l_port2);
-  ASSERT (proto == proto3);
-  ASSERT (fib_index == fib_index2);
 }
 
 static clib_error_t *
 nat_ip_table_add_del (vnet_main_t * vnm, u32 table_id, u32 is_add)
 {
   u32 fib_index;
-
-      // TODO: consider removing all NAT interfaces
-      if (!is_add)
+  if (!is_add)
+    {
+      fib_index = ip4_fib_index_from_table_id (table_id);
+      if (fib_index != ~0)
        {
-         fib_index = ip4_fib_index_from_table_id (table_id);
-         if (fib_index != ~0)
-           expire_per_vrf_sessions (fib_index);
+         expire_per_vrf_sessions (fib_index);
        }
+    }
   return 0;
 }
 
@@ -2022,13 +2284,14 @@ nat_init (vlib_main_t * vm)
   sm->log_level = NAT_LOG_ERROR;
 
   nat44_set_node_indexes (sm, vm);
+
   sm->log_class = vlib_log_register_class ("nat", 0);
   nat_ipfix_logging_init (vm);
 
   nat_init_simple_counter (sm->total_sessions, "total-sessions",
                           "/nat44-ed/total-sessions");
-  sm->max_cfg_sessions_gauge = stat_segment_new_entry (
-    (u8 *) "/nat44-ed/max-cfg-sessions", STAT_DIR_TYPE_SCALAR_INDEX);
+  sm->max_cfg_sessions_gauge =
+    vlib_stats_add_gauge ("/nat44-ed/max-cfg-sessions");
 
 #define _(x)                                                                  \
   nat_init_simple_counter (sm->counters.fastpath.in2out.x, #x,                \
@@ -2061,23 +2324,24 @@ nat_init (vlib_main_t * vm)
   /* Use all available workers by default */
   if (sm->num_workers > 1)
     {
-
       for (i = 0; i < sm->num_workers; i++)
        bitmap = clib_bitmap_set (bitmap, i, 1);
       snat_set_workers (bitmap);
       clib_bitmap_free (bitmap);
     }
   else
-    sm->per_thread_data[0].snat_thread_index = 0;
+    {
+      sm->per_thread_data[0].snat_thread_index = 0;
+    }
 
   /* callbacks to call when interface address changes. */
-  cbi.function = snat_ip4_add_del_interface_address_cb;
+  cbi.function = nat44_ed_add_del_interface_address_cb;
   vec_add1 (sm->ip4_main->add_del_interface_address_callbacks, cbi);
-  cbi.function = nat_ip4_add_del_addr_only_sm_cb;
+  cbi.function = nat44_ed_add_del_static_mapping_cb;
   vec_add1 (sm->ip4_main->add_del_interface_address_callbacks, cbi);
 
   /* callbacks to call when interface to table biding changes */
-  cbt.function = snat_update_outside_fib;
+  cbt.function = nat44_ed_update_outside_fib_cb;
   vec_add1 (sm->ip4_main->table_bind_callbacks, cbt);
 
   sm->fib_src_low =
@@ -2102,36 +2366,17 @@ nat44_plugin_enable (nat44_config_t c)
 
   fail_if_enabled ();
 
-  // UPDATE based on these appropriate API/CLI
-  // c.static_mapping_only + c.connection_tracking
-  //  - supported in NAT EI & NAT ED
-  // c.out2in_dpo, c.static_mapping_only
-  //  - supported in NAT EI
-
-  if (c.static_mapping_only && !c.connection_tracking)
-    {
-      nat_log_err ("unsupported combination of configuration");
-      return 1;
-    }
-
-  // nat44 feature configuration
-  sm->static_mapping_only = c.static_mapping_only;
-  sm->static_mapping_connection_tracking = c.connection_tracking;
-
   sm->forwarding_enabled = 0;
   sm->mss_clamping = 0;
-  sm->pat = (!c.static_mapping_only ||
-            (c.static_mapping_only && c.connection_tracking));
 
   if (!c.sessions)
     c.sessions = 63 * 1024;
 
   sm->max_translations_per_thread = c.sessions;
-  stat_segment_set_state_counter (sm->max_cfg_sessions_gauge,
-                                 sm->max_translations_per_thread);
+  vlib_stats_set_gauge (sm->max_cfg_sessions_gauge,
+                       sm->max_translations_per_thread);
   sm->translation_buckets = nat_calc_bihash_buckets (c.sessions);
 
-  // ED only feature
   vec_add1 (sm->max_translations_per_fib, sm->max_translations_per_thread);
 
   sm->inside_vrf_id = c.inside_vrf;
@@ -2145,6 +2390,8 @@ nat44_plugin_enable (nat44_config_t c)
 
   nat44_ed_db_init (sm->max_translations_per_thread, sm->translation_buckets);
 
+  nat44_ed_init_tcp_state_stable (sm);
+
   nat_affinity_enable ();
 
   nat_reset_timeouts (&sm->timeouts);
@@ -2152,7 +2399,28 @@ nat44_plugin_enable (nat44_config_t c)
   vlib_zero_simple_counter (&sm->total_sessions, 0);
 
   if (!sm->frame_queue_nelts)
-    sm->frame_queue_nelts = NAT_FQ_NELTS_DEFAULT;
+    {
+      sm->frame_queue_nelts = NAT_FQ_NELTS_DEFAULT;
+    }
+
+  if (sm->num_workers > 1)
+    {
+      if (sm->fq_in2out_index == ~0)
+       {
+         sm->fq_in2out_index = vlib_frame_queue_main_init (
+           sm->in2out_node_index, sm->frame_queue_nelts);
+       }
+      if (sm->fq_out2in_index == ~0)
+       {
+         sm->fq_out2in_index = vlib_frame_queue_main_init (
+           sm->out2in_node_index, sm->frame_queue_nelts);
+       }
+      if (sm->fq_in2out_output_index == ~0)
+       {
+         sm->fq_in2out_output_index = vlib_frame_queue_main_init (
+           sm->in2out_output_node_index, sm->frame_queue_nelts);
+       }
+    }
 
   sm->enabled = 1;
   sm->rconfig = c;
@@ -2160,86 +2428,168 @@ nat44_plugin_enable (nat44_config_t c)
   return 0;
 }
 
-void
-nat44_addresses_free (snat_address_t ** addresses)
+int
+nat44_ed_del_addresses ()
 {
-  snat_address_t *ap;
-  vec_foreach (ap, *addresses)
+  snat_main_t *sm = &snat_main;
+  snat_address_t *a, *vec;
+  int error = 0;
+
+  vec = vec_dup (sm->addresses);
+  vec_foreach (a, vec)
+    {
+      error = nat44_ed_del_address (a->addr, 0);
+      if (error)
+       {
+         nat_log_err ("error occurred while removing adderess");
+       }
+    }
+  vec_free (vec);
+  vec_free (sm->addresses);
+  sm->addresses = 0;
+
+  vec = vec_dup (sm->twice_nat_addresses);
+  vec_foreach (a, vec)
     {
-    #define _(N, i, n, s) \
-      vec_free (ap->busy_##n##_ports_per_thread);
-      foreach_nat_protocol
-    #undef _
+      error = nat44_ed_del_address (a->addr, 1);
+      if (error)
+       {
+         nat_log_err ("error occurred while removing adderess");
+       }
     }
-  vec_free (*addresses);
-  *addresses = 0;
+  vec_free (vec);
+  vec_free (sm->twice_nat_addresses);
+  sm->twice_nat_addresses = 0;
+
+  vec_free (sm->addr_to_resolve);
+  sm->addr_to_resolve = 0;
+
+  return error;
 }
 
 int
-nat44_plugin_disable ()
+nat44_ed_del_interfaces ()
 {
   snat_main_t *sm = &snat_main;
-  snat_interface_t *i, *vec;
+  snat_interface_t *i, *pool;
   int error = 0;
 
-  fail_if_disabled ();
-
-  // first unregister all nodes from interfaces
-  vec = vec_dup (sm->interfaces);
-  vec_foreach (i, vec)
+  pool = pool_dup (sm->interfaces);
+  pool_foreach (i, pool)
     {
-      if (nat_interface_is_inside(i))
-        error = snat_interface_add_del (i->sw_if_index, 1, 1);
-      if (nat_interface_is_outside(i))
-        error = snat_interface_add_del (i->sw_if_index, 0, 1);
+      if (nat44_ed_is_interface_inside (i))
+       {
+         error = nat44_ed_del_interface (i->sw_if_index, 1);
+       }
+      if (nat44_ed_is_interface_outside (i))
+       {
+         error = nat44_ed_del_interface (i->sw_if_index, 0);
+       }
 
       if (error)
-        {
-          nat_log_err ("error occurred while removing interface %u",
-                       i->sw_if_index);
-        }
+       {
+         nat_log_err ("error occurred while removing interface");
+       }
     }
-  vec_free (vec);
+  pool_free (pool);
+  pool_free (sm->interfaces);
   sm->interfaces = 0;
+  return error;
+}
 
-  vec = vec_dup (sm->output_feature_interfaces);
-  vec_foreach (i, vec)
-    {
-      if (nat_interface_is_inside(i))
-        error = snat_interface_add_del_output_feature (i->sw_if_index, 1, 1);
-      if (nat_interface_is_outside(i))
-        error = snat_interface_add_del_output_feature (i->sw_if_index, 0, 1);
+int
+nat44_ed_del_output_interfaces ()
+{
+  snat_main_t *sm = &snat_main;
+  snat_interface_t *i, *pool;
+  int error = 0;
 
+  pool = pool_dup (sm->output_feature_interfaces);
+  pool_foreach (i, pool)
+    {
+      error = nat44_ed_del_output_interface (i->sw_if_index);
       if (error)
-        {
-          nat_log_err ("error occurred while removing interface %u",
-                       i->sw_if_index);
-        }
+       {
+         nat_log_err ("error occurred while removing output interface");
+       }
     }
-  vec_free (vec);
+  pool_free (pool);
+  pool_free (sm->output_feature_interfaces);
   sm->output_feature_interfaces = 0;
+  return error;
+}
+
+int
+nat44_ed_del_static_mappings ()
+{
+  snat_main_t *sm = &snat_main;
+  snat_static_mapping_t *m, *pool;
+  int error = 0;
+
+  pool = pool_dup (sm->static_mappings);
+  pool_foreach (m, pool)
+    {
+      error = nat44_ed_del_static_mapping_internal (
+       m->local_addr, m->external_addr, m->local_port, m->external_port,
+       m->proto, m->vrf_id, m->flags);
+      if (error)
+       {
+         nat_log_err ("error occurred while removing mapping");
+       }
+    }
+  pool_free (pool);
+  pool_free (sm->static_mappings);
+  sm->static_mappings = 0;
+
+  vec_free (sm->sm_to_resolve);
+  sm->sm_to_resolve = 0;
+
+  return error;
+}
+
+int
+nat44_plugin_disable ()
+{
+  snat_main_per_thread_data_t *tsm;
+  snat_main_t *sm = &snat_main;
+  int rc, error = 0;
+
+  fail_if_disabled ();
+
+  rc = nat44_ed_del_static_mappings ();
+  if (rc)
+    error = 1;
+
+  rc = nat44_ed_del_addresses ();
+  if (rc)
+    error = 1;
+
+  rc = nat44_ed_del_interfaces ();
+  if (rc)
+    error = 1;
+
+  rc = nat44_ed_del_output_interfaces ();
+  if (rc)
+    error = 1;
 
   vec_free (sm->max_translations_per_fib);
+  sm->max_translations_per_fib = 0;
 
-  nat44_ed_db_free ();
+  clib_bihash_free_16_8 (&sm->flow_hash);
 
-  nat44_addresses_free (&sm->addresses);
-  nat44_addresses_free (&sm->twice_nat_addresses);
+  vec_foreach (tsm, sm->per_thread_data)
+    {
+      nat44_ed_worker_db_free (tsm);
+    }
 
-  vec_free (sm->to_resolve);
-  vec_free (sm->auto_add_sw_if_indices);
-  vec_free (sm->auto_add_sw_if_indices_twice_nat);
+  clib_memset (&sm->rconfig, 0, sizeof (sm->rconfig));
 
-  sm->to_resolve = 0;
-  sm->auto_add_sw_if_indices = 0;
-  sm->auto_add_sw_if_indices_twice_nat = 0;
+  nat_affinity_disable ();
 
   sm->forwarding_enabled = 0;
-
   sm->enabled = 0;
-  clib_memset (&sm->rconfig, 0, sizeof (sm->rconfig));
 
-  return 0;
+  return error;
 }
 
 void
@@ -2253,14 +2603,16 @@ nat44_ed_forwarding_enable_disable (u8 is_enable)
 
   sm->forwarding_enabled = is_enable != 0;
 
-  if (is_enable)
-    return;
+  if (!sm->enabled || is_enable)
+    {
+      return;
+    }
 
   vec_foreach (tsm, sm->per_thread_data)
     {
       pool_foreach (s, tsm->sessions)
        {
-         if (is_fwd_bypass_session (s))
+         if (na44_ed_is_fwd_bypass_session (s))
            {
              vec_add1 (ses_to_be_removed, s - tsm->sessions);
            }
@@ -2268,7 +2620,7 @@ nat44_ed_forwarding_enable_disable (u8 is_enable)
       vec_foreach (ses_index, ses_to_be_removed)
        {
          s = pool_elt_at_index (tsm->sessions, ses_index[0]);
-         nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
+         nat44_ed_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
          nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
        }
 
@@ -2276,128 +2628,91 @@ nat44_ed_forwarding_enable_disable (u8 is_enable)
     }
 }
 
-void
-snat_free_outside_address_and_port (snat_address_t *addresses,
-                                   u32 thread_index, ip4_address_t *addr,
-                                   u16 port, nat_protocol_t protocol)
+static_always_inline snat_static_mapping_t *
+nat44_ed_sm_match (snat_main_t *sm, ip4_address_t match_addr, u16 match_port,
+                  u32 match_fib_index, ip_protocol_t match_protocol,
+                  int by_external)
 {
-  snat_main_t *sm = &snat_main;
-  snat_address_t *a;
-  u32 address_index;
-  u16 port_host_byte_order = clib_net_to_host_u16 (port);
-
-  for (address_index = 0; address_index < vec_len (addresses);
-       address_index++)
+  snat_static_mapping_t *m;
+  if (!by_external)
     {
-      if (addresses[address_index].addr.as_u32 == addr->as_u32)
-       break;
-    }
+      m = nat44_ed_sm_i2o_lookup (sm, match_addr, match_port, match_fib_index,
+                                 match_protocol);
+      if (m)
+       return m;
 
-  ASSERT (address_index < vec_len (addresses));
+      /* Try address only mapping */
+      m = nat44_ed_sm_i2o_lookup (sm, match_addr, 0, match_fib_index, 0);
+      if (m)
+       return m;
 
-  a = addresses + address_index;
+      if (sm->inside_fib_index != match_fib_index)
+       {
+         m = nat44_ed_sm_i2o_lookup (sm, match_addr, match_port,
+                                     sm->inside_fib_index, match_protocol);
+         if (m)
+           return m;
 
-  switch (protocol)
-    {
-#define _(N, i, n, s) \
-    case NAT_PROTOCOL_##N: \
-      ASSERT (a->busy_##n##_port_refcounts[port_host_byte_order] >= 1); \
-      --a->busy_##n##_port_refcounts[port_host_byte_order]; \
-      a->busy_##n##_ports--; \
-      a->busy_##n##_ports_per_thread[thread_index]--; \
-      break;
-      foreach_nat_protocol
-#undef _
-       default : nat_elog_info (sm, "unknown protocol");
-      return;
-    }
-}
+         /* Try address only mapping */
+         m = nat44_ed_sm_i2o_lookup (sm, match_addr, 0, sm->inside_fib_index,
+                                     0);
+         if (m)
+           return m;
+       }
+      if (sm->outside_fib_index != match_fib_index)
+       {
+         m = nat44_ed_sm_i2o_lookup (sm, match_addr, match_port,
+                                     sm->outside_fib_index, match_protocol);
+         if (m)
+           return m;
 
-int
-nat_set_outside_address_and_port (snat_address_t *addresses, u32 thread_index,
-                                 ip4_address_t addr, u16 port,
-                                 nat_protocol_t protocol)
-{
-  snat_main_t *sm = &snat_main;
-  snat_address_t *a = 0;
-  u32 address_index;
-  u16 port_host_byte_order = clib_net_to_host_u16 (port);
-
-  for (address_index = 0; address_index < vec_len (addresses);
-       address_index++)
-    {
-      if (addresses[address_index].addr.as_u32 != addr.as_u32)
-       continue;
-
-      a = addresses + address_index;
-      switch (protocol)
-       {
-#define _(N, j, n, s) \
-        case NAT_PROTOCOL_##N: \
-          if (a->busy_##n##_port_refcounts[port_host_byte_order]) \
-            return VNET_API_ERROR_INSTANCE_IN_USE; \
-         ++a->busy_##n##_port_refcounts[port_host_byte_order]; \
-          a->busy_##n##_ports_per_thread[thread_index]++; \
-          a->busy_##n##_ports++; \
-          return 0;
-         foreach_nat_protocol
-#undef _
-           default : nat_elog_info (sm, "unknown protocol");
-         return 1;
+         /* Try address only mapping */
+         m = nat44_ed_sm_i2o_lookup (sm, match_addr, 0, sm->outside_fib_index,
+                                     0);
+         if (m)
+           return m;
        }
     }
+  else
+    {
+      m =
+       nat44_ed_sm_o2i_lookup (sm, match_addr, match_port, 0, match_protocol);
+      if (m)
+       return m;
 
-  return VNET_API_ERROR_NO_SUCH_ENTRY;
+      /* Try address only mapping */
+      m = nat44_ed_sm_o2i_lookup (sm, match_addr, 0, 0, 0);
+      if (m)
+       return m;
+    }
+  return 0;
 }
 
 int
 snat_static_mapping_match (vlib_main_t *vm, snat_main_t *sm,
                           ip4_address_t match_addr, u16 match_port,
-                          u32 match_fib_index, nat_protocol_t match_protocol,
+                          u32 match_fib_index, ip_protocol_t match_protocol,
                           ip4_address_t *mapping_addr, u16 *mapping_port,
-                          u32 *mapping_fib_index, u8 by_external,
+                          u32 *mapping_fib_index, int by_external,
                           u8 *is_addr_only, twice_nat_type_t *twice_nat,
                           lb_nat_type_t *lb, ip4_address_t *ext_host_addr,
                           u8 *is_identity_nat, snat_static_mapping_t **out)
 {
-  clib_bihash_kv_8_8_t kv, value;
-  clib_bihash_8_8_t *mapping_hash;
   snat_static_mapping_t *m;
   u32 rand, lo = 0, hi, mid, *tmp = 0, i;
   nat44_lb_addr_port_t *local;
   u8 backend_index;
 
-  if (!by_external)
-    {
-      mapping_hash = &sm->static_mapping_by_local;
-      init_nat_k (&kv, match_addr, match_port, match_fib_index,
-                 match_protocol);
-      if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
-       {
-         /* Try address only mapping */
-         init_nat_k (&kv, match_addr, 0, match_fib_index, 0);
-         if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
-           return 1;
-       }
-    }
-  else
+  m = nat44_ed_sm_match (sm, match_addr, match_port, match_fib_index,
+                        match_protocol, by_external);
+  if (!m)
     {
-      mapping_hash = &sm->static_mapping_by_external;
-      init_nat_k (&kv, match_addr, match_port, 0, match_protocol);
-      if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
-       {
-         /* Try address only mapping */
-         init_nat_k (&kv, match_addr, 0, 0, 0);
-         if (clib_bihash_search_8_8 (mapping_hash, &kv, &value))
-           return 1;
-       }
+      return 1;
     }
 
-  m = pool_elt_at_index (sm->static_mappings, value.value);
-
   if (by_external)
     {
-      if (is_lb_static_mapping (m))
+      if (is_sm_lb (m->flags))
        {
          if (PREDICT_FALSE (lb != 0))
            *lb = m->affinity ? AFFINITY_LB_NAT : LB_NAT;
@@ -2470,28 +2785,39 @@ snat_static_mapping_match (vlib_main_t *vm, snat_main_t *sm,
          *mapping_fib_index = m->fib_index;
          *mapping_addr = m->local_addr;
          /* Address only mapping doesn't change port */
-         *mapping_port = is_addr_only_static_mapping (m) ? match_port
-           : m->local_port;
+         *mapping_port =
+           is_sm_addr_only (m->flags) ? match_port : m->local_port;
        }
     }
   else
     {
       *mapping_addr = m->external_addr;
       /* Address only mapping doesn't change port */
-      *mapping_port = is_addr_only_static_mapping (m) ? match_port
-       : m->external_port;
+      *mapping_port =
+       is_sm_addr_only (m->flags) ? match_port : m->external_port;
       *mapping_fib_index = sm->outside_fib_index;
     }
 
 end:
   if (PREDICT_FALSE (is_addr_only != 0))
-    *is_addr_only = is_addr_only_static_mapping (m);
+    *is_addr_only = is_sm_addr_only (m->flags);
 
   if (PREDICT_FALSE (twice_nat != 0))
-    *twice_nat = m->twice_nat;
+    {
+      *twice_nat = TWICE_NAT_DISABLED;
+
+      if (is_sm_twice_nat (m->flags))
+       {
+         *twice_nat = TWICE_NAT;
+       }
+      else if (is_sm_self_twice_nat (m->flags))
+       {
+         *twice_nat = TWICE_NAT_SELF;
+       }
+    }
 
   if (PREDICT_FALSE (is_identity_nat != 0))
-    *is_identity_nat = is_identity_static_mapping (m);
+    *is_identity_nat = is_sm_identity_nat (m->flags);
 
   if (out != 0)
     *out = m;
@@ -2550,9 +2876,33 @@ nat44_ed_get_in2out_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
            }
        }
 
-      init_ed_k (&kv16, ip->src_address, vnet_buffer (b)->ip.reass.l4_src_port,
-                ip->dst_address, vnet_buffer (b)->ip.reass.l4_dst_port,
-                fib_index, ip->protocol);
+      if (PREDICT_FALSE (ip->protocol == IP_PROTOCOL_ICMP))
+       {
+         ip4_address_t lookup_saddr, lookup_daddr;
+         u16 lookup_sport, lookup_dport;
+         u8 lookup_protocol;
+
+         if (!nat_get_icmp_session_lookup_values (
+               b, ip, &lookup_saddr, &lookup_sport, &lookup_daddr,
+               &lookup_dport, &lookup_protocol))
+           {
+             init_ed_k (&kv16, lookup_saddr.as_u32, lookup_sport,
+                        lookup_daddr.as_u32, lookup_dport, rx_fib_index,
+                        lookup_protocol);
+             if (!clib_bihash_search_16_8 (&sm->flow_hash, &kv16, &value16))
+               {
+                 next_worker_index = ed_value_get_thread_index (&value16);
+                 vnet_buffer2 (b)->nat.cached_session_index =
+                   ed_value_get_session_index (&value16);
+                 goto out;
+               }
+           }
+       }
+
+      init_ed_k (&kv16, ip->src_address.as_u32,
+                vnet_buffer (b)->ip.reass.l4_src_port, ip->dst_address.as_u32,
+                vnet_buffer (b)->ip.reass.l4_dst_port, fib_index,
+                ip->protocol);
 
       if (!clib_bihash_search_16_8 (&sm->flow_hash, &kv16, &value16))
        {
@@ -2563,9 +2913,10 @@ nat44_ed_get_in2out_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
        }
 
       // dst NAT
-      init_ed_k (&kv16, ip->dst_address, vnet_buffer (b)->ip.reass.l4_dst_port,
-                ip->src_address, vnet_buffer (b)->ip.reass.l4_src_port,
-                rx_fib_index, ip->protocol);
+      init_ed_k (&kv16, ip->dst_address.as_u32,
+                vnet_buffer (b)->ip.reass.l4_dst_port, ip->src_address.as_u32,
+                vnet_buffer (b)->ip.reass.l4_src_port, rx_fib_index,
+                ip->protocol);
       if (!clib_bihash_search_16_8 (&sm->flow_hash, &kv16, &value16))
        {
          next_worker_index = ed_value_get_thread_index (&value16);
@@ -2607,17 +2958,16 @@ nat44_ed_get_out2in_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
                                  u32 rx_fib_index, u8 is_output)
 {
   snat_main_t *sm = &snat_main;
-  clib_bihash_kv_8_8_t kv, value;
   clib_bihash_kv_16_8_t kv16, value16;
 
-  u32 proto, next_worker_index = 0;
+  u8 proto, next_worker_index = 0;
   u16 port;
   snat_static_mapping_t *m;
   u32 hash;
 
-  proto = ip_proto_to_nat_proto (ip->protocol);
+  proto = ip->protocol;
 
-  if (PREDICT_FALSE (proto == NAT_PROTOCOL_ICMP))
+  if (PREDICT_FALSE (IP_PROTOCOL_ICMP == proto))
     {
       ip4_address_t lookup_saddr, lookup_daddr;
       u16 lookup_sport, lookup_dport;
@@ -2626,8 +2976,9 @@ nat44_ed_get_out2in_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
            b, ip, &lookup_saddr, &lookup_sport, &lookup_daddr, &lookup_dport,
            &lookup_protocol))
        {
-         init_ed_k (&kv16, lookup_saddr, lookup_sport, lookup_daddr,
-                    lookup_dport, rx_fib_index, lookup_protocol);
+         init_ed_k (&kv16, lookup_saddr.as_u32, lookup_sport,
+                    lookup_daddr.as_u32, lookup_dport, rx_fib_index,
+                    lookup_protocol);
          if (PREDICT_TRUE (
                !clib_bihash_search_16_8 (&sm->flow_hash, &kv16, &value16)))
            {
@@ -2641,9 +2992,10 @@ nat44_ed_get_out2in_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
        }
     }
 
-  init_ed_k (&kv16, ip->src_address, vnet_buffer (b)->ip.reass.l4_src_port,
-            ip->dst_address, vnet_buffer (b)->ip.reass.l4_dst_port,
-            rx_fib_index, ip->protocol);
+  init_ed_k (&kv16, ip->src_address.as_u32,
+            vnet_buffer (b)->ip.reass.l4_src_port, ip->dst_address.as_u32,
+            vnet_buffer (b)->ip.reass.l4_dst_port, rx_fib_index,
+            ip->protocol);
 
   if (PREDICT_TRUE (
        !clib_bihash_search_16_8 (&sm->flow_hash, &kv16, &value16)))
@@ -2661,18 +3013,18 @@ nat44_ed_get_out2in_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
   /* first try static mappings without port */
   if (PREDICT_FALSE (pool_elts (sm->static_mappings)))
     {
-      init_nat_k (&kv, ip->dst_address, 0, 0, 0);
-      if (!clib_bihash_search_8_8
-         (&sm->static_mapping_by_external, &kv, &value))
+      m = nat44_ed_sm_o2i_lookup (sm, ip->dst_address, 0, 0, proto);
+      if (m)
        {
-         m = pool_elt_at_index (sm->static_mappings, value.value);
-         next_worker_index = m->workers[0];
-         goto done;
+         {
+           next_worker_index = m->workers[0];
+           goto done;
+         }
        }
     }
 
   /* unknown protocol */
-  if (PREDICT_FALSE (proto == NAT_PROTOCOL_OTHER))
+  if (PREDICT_FALSE (nat44_ed_is_unk_proto (proto)))
     {
       /* use current thread */
       next_worker_index = vlib_get_thread_index ();
@@ -2693,17 +3045,18 @@ nat44_ed_get_out2in_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
        {
          /* if error message, then it's not fragmented and we can access it */
          ip4_header_t *inner_ip = (ip4_header_t *) (echo + 1);
-         proto = ip_proto_to_nat_proto (inner_ip->protocol);
+         proto = inner_ip->protocol;
          void *l4_header = ip4_next_header (inner_ip);
          switch (proto)
            {
-           case NAT_PROTOCOL_ICMP:
+           case IP_PROTOCOL_ICMP:
              icmp = (icmp46_header_t *) l4_header;
              echo = (icmp_echo_header_t *) (icmp + 1);
              port = echo->identifier;
              break;
-           case NAT_PROTOCOL_UDP:
-           case NAT_PROTOCOL_TCP:
+           case IP_PROTOCOL_UDP:
+             /* breakthrough */
+           case IP_PROTOCOL_TCP:
              port = ((tcp_udp_header_t *) l4_header)->src_port;
              break;
            default:
@@ -2716,12 +3069,10 @@ nat44_ed_get_out2in_worker_index (vlib_buffer_t *b, ip4_header_t *ip,
   /* try static mappings with port */
   if (PREDICT_FALSE (pool_elts (sm->static_mappings)))
     {
-      init_nat_k (&kv, ip->dst_address, port, 0, proto);
-      if (!clib_bihash_search_8_8
-         (&sm->static_mapping_by_external, &kv, &value))
+      m = nat44_ed_sm_o2i_lookup (sm, ip->dst_address, port, 0, proto);
+      if (m)
        {
-         m = pool_elt_at_index (sm->static_mappings, value.value);
-         if (!is_lb_static_mapping (m))
+         if (!is_sm_lb (m->flags))
            {
              next_worker_index = m->workers[0];
              goto done;
@@ -2794,8 +3145,8 @@ nat44_update_session_limit (u32 session_limit, u32 vrf_id)
     return 1;
   sm->max_translations_per_thread = nat44_get_max_session_limit ();
 
-  stat_segment_set_state_counter (sm->max_cfg_sessions_gauge,
-                                 sm->max_translations_per_thread);
+  vlib_stats_set_gauge (sm->max_cfg_sessions_gauge,
+                       sm->max_translations_per_thread);
 
   sm->translation_buckets =
     nat_calc_bihash_buckets (sm->max_translations_per_thread);
@@ -2850,30 +3201,13 @@ nat44_ed_db_init (u32 translations, u32 translation_buckets)
 {
   snat_main_t *sm = &snat_main;
   snat_main_per_thread_data_t *tsm;
-  u32 static_mapping_buckets = 1024;
-  u32 static_mapping_memory_size = 64 << 20;
 
   reinit_ed_flow_hash ();
 
-  clib_bihash_init_8_8 (&sm->static_mapping_by_local,
-                       "static_mapping_by_local", static_mapping_buckets,
-                       static_mapping_memory_size);
-  clib_bihash_set_kvp_format_fn_8_8 (&sm->static_mapping_by_local,
-                                    format_static_mapping_kvp);
-
-  clib_bihash_init_8_8 (&sm->static_mapping_by_external,
-                       "static_mapping_by_external", static_mapping_buckets,
-                       static_mapping_memory_size);
-  clib_bihash_set_kvp_format_fn_8_8 (&sm->static_mapping_by_external,
-                                    format_static_mapping_kvp);
-
-  if (sm->pat)
+  vec_foreach (tsm, sm->per_thread_data)
     {
-      vec_foreach (tsm, sm->per_thread_data)
-       {
-         nat44_ed_worker_db_init (tsm, sm->max_translations_per_thread,
-                                  sm->translation_buckets);
-       }
+      nat44_ed_worker_db_init (tsm, sm->max_translations_per_thread,
+                              sm->translation_buckets);
     }
 }
 
@@ -2885,26 +3219,6 @@ nat44_ed_worker_db_free (snat_main_per_thread_data_t *tsm)
   vec_free (tsm->per_vrf_sessions_vec);
 }
 
-static void
-nat44_ed_db_free ()
-{
-  snat_main_t *sm = &snat_main;
-  snat_main_per_thread_data_t *tsm;
-
-  pool_free (sm->static_mappings);
-  clib_bihash_free_16_8 (&sm->flow_hash);
-  clib_bihash_free_8_8 (&sm->static_mapping_by_local);
-  clib_bihash_free_8_8 (&sm->static_mapping_by_external);
-
-  if (sm->pat)
-    {
-      vec_foreach (tsm, sm->per_thread_data)
-       {
-         nat44_ed_worker_db_free (tsm);
-       }
-    }
-}
-
 void
 nat44_ed_sessions_clear ()
 {
@@ -2913,244 +3227,271 @@ nat44_ed_sessions_clear ()
 
   reinit_ed_flow_hash ();
 
-  if (sm->pat)
+  vec_foreach (tsm, sm->per_thread_data)
     {
-      vec_foreach (tsm, sm->per_thread_data)
-       {
-
-         nat44_ed_worker_db_free (tsm);
-         nat44_ed_worker_db_init (tsm, sm->max_translations_per_thread,
-                                  sm->translation_buckets);
-       }
+      nat44_ed_worker_db_free (tsm);
+      nat44_ed_worker_db_init (tsm, sm->max_translations_per_thread,
+                              sm->translation_buckets);
     }
   vlib_zero_simple_counter (&sm->total_sessions, 0);
 }
 
 static void
-nat_ip4_add_del_addr_only_sm_cb (ip4_main_t * im,
-                                uword opaque,
-                                u32 sw_if_index,
-                                ip4_address_t * address,
-                                u32 address_length,
-                                u32 if_address_index, u32 is_delete)
+nat44_ed_add_del_static_mapping_cb (ip4_main_t *im, uword opaque,
+                                   u32 sw_if_index, ip4_address_t *address,
+                                   u32 address_length, u32 if_address_index,
+                                   u32 is_delete)
 {
+  snat_static_mapping_resolve_t *rp;
   snat_main_t *sm = &snat_main;
-  snat_static_map_resolve_t *rp;
-  snat_static_mapping_t *m;
-  clib_bihash_kv_8_8_t kv, value;
-  int i, rv;
-  ip4_address_t l_addr;
+  int rv = 0;
 
   if (!sm->enabled)
-    return;
-
-  for (i = 0; i < vec_len (sm->to_resolve); i++)
     {
-      rp = sm->to_resolve + i;
-      if (rp->addr_only == 0)
-       continue;
-      if (rp->sw_if_index == sw_if_index)
-       goto match;
+      return;
     }
 
-  return;
+  vec_foreach (rp, sm->sm_to_resolve)
+    {
+      if (sw_if_index == rp->sw_if_index)
+       {
+         if (is_delete)
+           {
+             if (rp->is_resolved)
+               {
+                 rv = nat44_ed_del_static_mapping_internal (
+                   rp->l_addr, address[0], rp->l_port, rp->e_port, rp->proto,
+                   rp->vrf_id, rp->flags);
+                 if (rv)
+                   {
+                     nat_log_err ("ed del static mapping failed");
+                   }
+                 else
+                   {
+                     rp->is_resolved = 0;
+                   }
+               }
+           }
+         else
+           {
+             if (!rp->is_resolved)
+               {
+                 rv = nat44_ed_add_static_mapping_internal (
+                   rp->l_addr, address[0], rp->l_port, rp->e_port, rp->proto,
+                   rp->vrf_id, ~0, rp->flags, rp->pool_addr, rp->tag);
+                 if (rv)
+                   {
+                     nat_log_err ("ed add static mapping failed");
+                   }
+                 else
+                   {
+                     rp->is_resolved = 1;
+                   }
+               }
+           }
+       }
+    }
+}
 
-match:
-  init_nat_k (&kv, *address, rp->addr_only ? 0 : rp->e_port,
-             sm->outside_fib_index, rp->addr_only ? 0 : rp->proto);
-  if (clib_bihash_search_8_8 (&sm->static_mapping_by_external, &kv, &value))
-    m = 0;
-  else
-    m = pool_elt_at_index (sm->static_mappings, value.value);
+static int
+nat44_ed_get_addr_resolve_record (u32 sw_if_index, u8 twice_nat, int *out)
+{
+  snat_main_t *sm = &snat_main;
+  snat_address_resolve_t *rp;
+  int i;
 
-  if (!is_delete)
+  for (i = 0; i < vec_len (sm->addr_to_resolve); i++)
     {
-      /* Don't trip over lease renewal, static config */
-      if (m)
-       return;
+      rp = sm->addr_to_resolve + i;
+
+      if ((rp->sw_if_index == sw_if_index) && (rp->is_twice_nat == twice_nat))
+       {
+         if (out)
+           {
+             *out = i;
+           }
+         return 0;
+       }
     }
-  else
+  return 1;
+}
+static int
+nat44_ed_del_addr_resolve_record (u32 sw_if_index, u8 twice_nat)
+{
+  snat_main_t *sm = &snat_main;
+  int i;
+  if (!nat44_ed_get_addr_resolve_record (sw_if_index, twice_nat, &i))
     {
-      if (!m)
-       return;
+      vec_del1 (sm->addr_to_resolve, i);
+      return 0;
     }
-
-  /* Indetity mapping? */
-  if (rp->l_addr.as_u32 == 0)
-    l_addr.as_u32 = address[0].as_u32;
-  else
-    l_addr.as_u32 = rp->l_addr.as_u32;
-  /* Add the static mapping */
-  rv = snat_add_static_mapping (l_addr,
-                               address[0],
-                               rp->l_port,
-                               rp->e_port,
-                               rp->vrf_id,
-                               rp->addr_only, ~0 /* sw_if_index */ ,
-                               rp->proto, !is_delete, rp->twice_nat,
-                               rp->out2in_only, rp->tag, rp->identity_nat,
-                               rp->pool_addr, rp->exact);
-  if (rv)
-    nat_elog_notice_X1 (sm, "snat_add_static_mapping returned %d", "i4", rv);
+  return 1;
 }
 
 static void
-snat_ip4_add_del_interface_address_cb (ip4_main_t * im,
-                                      uword opaque,
-                                      u32 sw_if_index,
-                                      ip4_address_t * address,
+nat44_ed_add_del_interface_address_cb (ip4_main_t *im, uword opaque,
+                                      u32 sw_if_index, ip4_address_t *address,
                                       u32 address_length,
                                       u32 if_address_index, u32 is_delete)
 {
   snat_main_t *sm = &snat_main;
-  snat_static_map_resolve_t *rp;
-  ip4_address_t l_addr;
-  int i, j;
-  int rv;
+  snat_address_resolve_t *arp;
+  snat_address_t *ap;
   u8 twice_nat = 0;
-  snat_address_t *addresses = sm->addresses;
+  int i, rv;
 
   if (!sm->enabled)
-    return;
-
-  for (i = 0; i < vec_len (sm->auto_add_sw_if_indices); i++)
     {
-      if (sw_if_index == sm->auto_add_sw_if_indices[i])
-       goto match;
+      return;
     }
 
-  for (i = 0; i < vec_len (sm->auto_add_sw_if_indices_twice_nat); i++)
+  if (nat44_ed_get_addr_resolve_record (sw_if_index, twice_nat, &i))
     {
       twice_nat = 1;
-      addresses = sm->twice_nat_addresses;
-      if (sw_if_index == sm->auto_add_sw_if_indices_twice_nat[i])
-       goto match;
+      if (nat44_ed_get_addr_resolve_record (sw_if_index, twice_nat, &i))
+       {
+         u32 fib_index =
+           ip4_fib_table_get_index_for_sw_if_index (sw_if_index);
+         vec_foreach (ap, sm->addresses)
+           {
+             if ((fib_index == ap->fib_index) &&
+                 (address->as_u32 == ap->addr.as_u32))
+               {
+                 if (!is_delete)
+                   {
+                     ap->addr_len = address_length;
+                     ap->sw_if_index = sw_if_index;
+                     ap->net.as_u32 = (ap->addr.as_u32 >> (32 - ap->addr_len))
+                                      << (32 - ap->addr_len);
+
+                     nat_log_debug (
+                       "pool addr %U binds to -> sw_if_idx: %u net: %U/%u",
+                       format_ip4_address, &ap->addr, ap->sw_if_index,
+                       format_ip4_address, &ap->net, ap->addr_len);
+                   }
+                 else
+                   {
+                     ap->addr_len = ~0;
+                   }
+                 break;
+               }
+           }
+         return;
+       }
     }
 
-  return;
+  arp = sm->addr_to_resolve + i;
 
-match:
   if (!is_delete)
     {
-      /* Don't trip over lease renewal, static config */
-      for (j = 0; j < vec_len (addresses); j++)
-       if (addresses[j].addr.as_u32 == address->as_u32)
+      if (arp->is_resolved)
+       {
          return;
+       }
 
-      (void) snat_add_address (sm, address, ~0, twice_nat);
-      /* Scan static map resolution vector */
-      for (j = 0; j < vec_len (sm->to_resolve); j++)
+      rv = nat44_ed_add_address (address, ~0, arp->is_twice_nat);
+      if (0 == rv)
        {
-         rp = sm->to_resolve + j;
-         if (rp->addr_only)
-           continue;
-         /* On this interface? */
-         if (rp->sw_if_index == sw_if_index)
-           {
-             /* Indetity mapping? */
-             if (rp->l_addr.as_u32 == 0)
-               l_addr.as_u32 = address[0].as_u32;
-             else
-               l_addr.as_u32 = rp->l_addr.as_u32;
-             /* Add the static mapping */
-             rv = snat_add_static_mapping (
-               l_addr, address[0], rp->l_port, rp->e_port, rp->vrf_id,
-               rp->addr_only, ~0 /* sw_if_index */, rp->proto, 1,
-               rp->twice_nat, rp->out2in_only, rp->tag, rp->identity_nat,
-               rp->pool_addr, rp->exact);
-             if (rv)
-               nat_elog_notice_X1 (sm, "snat_add_static_mapping returned %d",
-                                   "i4", rv);
-           }
+         arp->is_resolved = 1;
        }
-      return;
     }
   else
     {
-      (void) snat_del_address (sm, address[0], 1, twice_nat);
-      return;
+      if (!arp->is_resolved)
+       {
+         return;
+       }
+
+      rv = nat44_ed_del_address (address[0], arp->is_twice_nat);
+      if (0 == rv)
+       {
+         arp->is_resolved = 0;
+       }
     }
 }
 
 int
-snat_add_interface_address (snat_main_t * sm, u32 sw_if_index, int is_del,
-                           u8 twice_nat)
+nat44_ed_add_interface_address (u32 sw_if_index, u8 twice_nat)
 {
+  snat_main_t *sm = &snat_main;
   ip4_main_t *ip4_main = sm->ip4_main;
   ip4_address_t *first_int_addr;
-  snat_static_map_resolve_t *rp;
-  u32 *indices_to_delete = 0;
-  int i, j;
-  u32 *auto_add_sw_if_indices =
-    twice_nat ? sm->
-    auto_add_sw_if_indices_twice_nat : sm->auto_add_sw_if_indices;
+  snat_address_resolve_t *ap;
+  int rv;
 
-  first_int_addr = ip4_interface_first_address (ip4_main, sw_if_index, 0       /* just want the address */
-    );
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
 
-  for (i = 0; i < vec_len (auto_add_sw_if_indices); i++)
+  if (!nat44_ed_get_addr_resolve_record (sw_if_index, twice_nat, 0))
     {
-      if (auto_add_sw_if_indices[i] == sw_if_index)
-       {
-         if (is_del)
-           {
-             /* if have address remove it */
-             if (first_int_addr)
-               (void) snat_del_address (sm, first_int_addr[0], 1, twice_nat);
-             else
-               {
-                 for (j = 0; j < vec_len (sm->to_resolve); j++)
-                   {
-                     rp = sm->to_resolve + j;
-                     if (rp->sw_if_index == sw_if_index)
-                       vec_add1 (indices_to_delete, j);
-                   }
-                 if (vec_len (indices_to_delete))
-                   {
-                     for (j = vec_len (indices_to_delete) - 1; j >= 0; j--)
-                       vec_del1 (sm->to_resolve, j);
-                     vec_free (indices_to_delete);
-                   }
-               }
-             if (twice_nat)
-               vec_del1 (sm->auto_add_sw_if_indices_twice_nat, i);
-             else
-               vec_del1 (sm->auto_add_sw_if_indices, i);
-           }
-         else
-           return VNET_API_ERROR_VALUE_EXIST;
+      return VNET_API_ERROR_VALUE_EXIST;
+    }
 
-         return 0;
+  vec_add2 (sm->addr_to_resolve, ap, 1);
+  ap->sw_if_index = sw_if_index;
+  ap->is_twice_nat = twice_nat;
+  ap->is_resolved = 0;
+
+  first_int_addr = ip4_interface_first_address (ip4_main, sw_if_index, 0);
+  if (first_int_addr)
+    {
+      rv = nat44_ed_add_address (first_int_addr, ~0, twice_nat);
+      if (0 != rv)
+       {
+         nat44_ed_del_addr_resolve_record (sw_if_index, twice_nat);
+         return rv;
        }
+      ap->is_resolved = 1;
     }
 
-  if (is_del)
-    return VNET_API_ERROR_NO_SUCH_ENTRY;
+  return 0;
+}
 
-  /* add to the auto-address list */
-  if (twice_nat)
-    vec_add1 (sm->auto_add_sw_if_indices_twice_nat, sw_if_index);
-  else
-    vec_add1 (sm->auto_add_sw_if_indices, sw_if_index);
+int
+nat44_ed_del_interface_address (u32 sw_if_index, u8 twice_nat)
+{
+  snat_main_t *sm = &snat_main;
+  ip4_main_t *ip4_main = sm->ip4_main;
+  ip4_address_t *first_int_addr;
+
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  if (nat44_ed_del_addr_resolve_record (sw_if_index, twice_nat))
+    {
+      return VNET_API_ERROR_NO_SUCH_ENTRY;
+    }
 
-  /* If the address is already bound - or static - add it now */
+  first_int_addr = ip4_interface_first_address (ip4_main, sw_if_index, 0);
   if (first_int_addr)
-    (void) snat_add_address (sm, first_int_addr, ~0, twice_nat);
+    {
+      return nat44_ed_del_address (first_int_addr[0], twice_nat);
+    }
 
   return 0;
 }
 
 int
-nat44_del_ed_session (snat_main_t * sm, ip4_address_t * addr, u16 port,
-                     ip4_address_t * eh_addr, u16 eh_port, u8 proto,
+nat44_ed_del_session (snat_main_t *sm, ip4_address_t *addr, u16 port,
+                     ip4_address_t *eh_addr, u16 eh_port, u8 proto,
                      u32 vrf_id, int is_in)
 {
   ip4_header_t ip;
   clib_bihash_kv_16_8_t kv, value;
-  u32 fib_index = fib_table_find (FIB_PROTOCOL_IP4, vrf_id);
+  u32 fib_index;
   snat_session_t *s;
   snat_main_per_thread_data_t *tsm;
 
+  if (!sm->enabled)
+    {
+      return VNET_API_ERROR_UNSUPPORTED;
+    }
+
+  fib_index = fib_table_find (FIB_PROTOCOL_IP4, vrf_id);
   ip.dst_address.as_u32 = ip.src_address.as_u32 = addr->as_u32;
   if (sm->num_workers > 1)
     tsm = vec_elt_at_index (
@@ -3159,7 +3500,8 @@ nat44_del_ed_session (snat_main_t * sm, ip4_address_t * addr, u16 port,
   else
     tsm = vec_elt_at_index (sm->per_thread_data, sm->num_workers);
 
-  init_ed_k (&kv, *addr, port, *eh_addr, eh_port, fib_index, proto);
+  init_ed_k (&kv, addr->as_u32, port, eh_addr->as_u32, eh_port, fib_index,
+            proto);
   if (clib_bihash_search_16_8 (&sm->flow_hash, &kv, &value))
     {
       return VNET_API_ERROR_NO_SUCH_ENTRY;
@@ -3168,7 +3510,7 @@ nat44_del_ed_session (snat_main_t * sm, ip4_address_t * addr, u16 port,
   if (pool_is_free_index (tsm->sessions, ed_value_get_session_index (&value)))
     return VNET_API_ERROR_UNSPECIFIED;
   s = pool_elt_at_index (tsm->sessions, ed_value_get_session_index (&value));
-  nat_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
+  nat44_ed_free_session_data (sm, s, tsm - sm->per_thread_data, 0);
   nat_ed_session_delete (sm, s, tsm - sm->per_thread_data, 1);
   return 0;
 }
@@ -3268,20 +3610,19 @@ nat_6t_l3_l4_csum_calc (nat_6t_flow_t *f)
     }
 }
 
-static_always_inline int nat_6t_flow_icmp_translate (snat_main_t *sm,
-                                                    vlib_buffer_t *b,
-                                                    ip4_header_t *ip,
-                                                    nat_6t_flow_t *f);
+static_always_inline int
+nat_6t_flow_icmp_translate (vlib_main_t *vm, snat_main_t *sm, vlib_buffer_t *b,
+                           ip4_header_t *ip, nat_6t_flow_t *f);
 
 static_always_inline void
 nat_6t_flow_ip4_translate (snat_main_t *sm, vlib_buffer_t *b, ip4_header_t *ip,
-                          nat_6t_flow_t *f, nat_protocol_t proto,
-                          int is_icmp_inner_ip4)
+                          nat_6t_flow_t *f, ip_protocol_t proto,
+                          int is_icmp_inner_ip4, int skip_saddr_rewrite)
 {
   udp_header_t *udp = ip4_next_header (ip);
   tcp_header_t *tcp = (tcp_header_t *) udp;
 
-  if ((NAT_PROTOCOL_TCP == proto || NAT_PROTOCOL_UDP == proto) &&
+  if ((IP_PROTOCOL_TCP == proto || IP_PROTOCOL_UDP == proto) &&
       !vnet_buffer (b)->ip.reass.is_non_first_fragment)
     {
       if (!is_icmp_inner_ip4)
@@ -3299,7 +3640,7 @@ nat_6t_flow_ip4_translate (snat_main_t *sm, vlib_buffer_t *b, ip4_header_t *ip,
          udp->dst_port = f->rewrite.sport;
        }
 
-      if (NAT_PROTOCOL_TCP == proto)
+      if (IP_PROTOCOL_TCP == proto)
        {
          ip_csum_t tcp_sum = tcp->checksum;
          tcp_sum = ip_csum_sub_even (tcp_sum, f->l3_csum_delta);
@@ -3307,7 +3648,7 @@ nat_6t_flow_ip4_translate (snat_main_t *sm, vlib_buffer_t *b, ip4_header_t *ip,
          mss_clamping (sm->mss_clamping, tcp, &tcp_sum);
          tcp->checksum = ip_csum_fold (tcp_sum);
        }
-      else if (proto == NAT_PROTOCOL_UDP && udp->checksum)
+      else if (IP_PROTOCOL_UDP == proto && udp->checksum)
        {
          ip_csum_t udp_sum = udp->checksum;
          udp_sum = ip_csum_sub_even (udp_sum, f->l3_csum_delta);
@@ -3319,7 +3660,10 @@ nat_6t_flow_ip4_translate (snat_main_t *sm, vlib_buffer_t *b, ip4_header_t *ip,
     {
       if (!is_icmp_inner_ip4)
        { // regular case
-         ip->src_address = f->rewrite.saddr;
+         if (!skip_saddr_rewrite)
+           {
+             ip->src_address = f->rewrite.saddr;
+           }
          ip->dst_address = f->rewrite.daddr;
        }
       else
@@ -3329,16 +3673,32 @@ nat_6t_flow_ip4_translate (snat_main_t *sm, vlib_buffer_t *b, ip4_header_t *ip,
        }
     }
 
-  ip_csum_t ip_sum = ip->checksum;
-  ip_sum = ip_csum_sub_even (ip_sum, f->l3_csum_delta);
-  ip->checksum = ip_csum_fold (ip_sum);
+  if (skip_saddr_rewrite)
+    {
+      ip->checksum = ip4_header_checksum (ip);
+    }
+  else
+    {
+      ip_csum_t ip_sum = ip->checksum;
+      ip_sum = ip_csum_sub_even (ip_sum, f->l3_csum_delta);
+      ip->checksum = ip_csum_fold (ip_sum);
+    }
   if (0xffff == ip->checksum)
     ip->checksum = 0;
   ASSERT (ip4_header_checksum_is_valid (ip));
 }
 
 static_always_inline int
-nat_6t_flow_icmp_translate (snat_main_t *sm, vlib_buffer_t *b,
+it_fits (vlib_main_t *vm, vlib_buffer_t *b, void *object, size_t size)
+{
+  int result = ((u8 *) object + size <=
+               (u8 *) vlib_buffer_get_current (b) + b->current_length) &&
+              vlib_object_within_buffer_data (vm, b, object, size);
+  return result;
+}
+
+static_always_inline int
+nat_6t_flow_icmp_translate (vlib_main_t *vm, snat_main_t *sm, vlib_buffer_t *b,
                            ip4_header_t *ip, nat_6t_flow_t *f)
 {
   if (IP_PROTOCOL_ICMP != ip->protocol)
@@ -3349,8 +3709,10 @@ nat_6t_flow_icmp_translate (snat_main_t *sm, vlib_buffer_t *b,
 
   if ((!vnet_buffer (b)->ip.reass.is_non_first_fragment))
     {
-      if (icmp->checksum == 0)
-       icmp->checksum = 0xffff;
+      if (!it_fits (vm, b, icmp, sizeof (*icmp)))
+       {
+         return NAT_ED_TRNSL_ERR_PACKET_TRUNCATED;
+       }
 
       if (!icmp_type_is_error_message (icmp->type))
        {
@@ -3367,32 +3729,88 @@ nat_6t_flow_icmp_translate (snat_main_t *sm, vlib_buffer_t *b,
        }
       else
        {
+         ip_csum_t sum = ip_incremental_checksum (
+           0, icmp,
+           clib_net_to_host_u16 (ip->length) - ip4_header_bytes (ip));
+         sum = (u16) ~ip_csum_fold (sum);
+         if (sum != 0)
+           {
+             return NAT_ED_TRNSL_ERR_INVALID_CSUM;
+           }
+
          // errors are not fragmented
          ip4_header_t *inner_ip = (ip4_header_t *) (echo + 1);
 
          if (!ip4_header_checksum_is_valid (inner_ip))
            {
-             return NAT_ED_TRNSL_ERR_TRANSLATION_FAILED;
+             return NAT_ED_TRNSL_ERR_INNER_IP_CORRUPT;
            }
 
-         nat_protocol_t inner_proto =
-           ip_proto_to_nat_proto (inner_ip->protocol);
+         ip_protocol_t inner_proto = inner_ip->protocol;
 
-         ip_csum_t icmp_sum = icmp->checksum;
+         ip_csum_t old_icmp_sum = icmp->checksum;
+         ip_csum_t old_inner_ip_sum = inner_ip->checksum;
+         ip_csum_t old_udp_sum;
+         ip_csum_t old_tcp_sum;
+         ip_csum_t new_icmp_sum;
+         udp_header_t *udp;
+         tcp_header_t *tcp;
 
          switch (inner_proto)
            {
-           case NAT_PROTOCOL_UDP:
-           case NAT_PROTOCOL_TCP:
+           case IP_PROTOCOL_UDP:
+             udp = (udp_header_t *) (inner_ip + 1);
+             if (!it_fits (vm, b, udp, sizeof (*udp)))
+               {
+                 return NAT_ED_TRNSL_ERR_PACKET_TRUNCATED;
+               }
+             old_udp_sum = udp->checksum;
+             nat_6t_flow_ip4_translate (sm, b, inner_ip, f, inner_proto,
+                                        1 /* is_icmp_inner_ip4 */,
+                                        0 /* skip_saddr_rewrite */);
+             new_icmp_sum = ip_csum_sub_even (old_icmp_sum, f->l3_csum_delta);
+             new_icmp_sum = ip_csum_sub_even (new_icmp_sum, f->l4_csum_delta);
+             new_icmp_sum =
+               ip_csum_update (new_icmp_sum, old_inner_ip_sum,
+                               inner_ip->checksum, ip4_header_t, checksum);
+             new_icmp_sum =
+               ip_csum_update (new_icmp_sum, old_udp_sum, udp->checksum,
+                               udp_header_t, checksum);
+             new_icmp_sum = ip_csum_fold (new_icmp_sum);
+             icmp->checksum = new_icmp_sum;
+             break;
+           case IP_PROTOCOL_TCP:
+             tcp = (tcp_header_t *) (inner_ip + 1);
+             if (!it_fits (vm, b, tcp, sizeof (*tcp)))
+               {
+                 return NAT_ED_TRNSL_ERR_PACKET_TRUNCATED;
+               }
+             old_tcp_sum = tcp->checksum;
              nat_6t_flow_ip4_translate (sm, b, inner_ip, f, inner_proto,
-                                        1 /* is_icmp_inner_ip4 */);
-             icmp_sum = ip_csum_sub_even (icmp_sum, f->l3_csum_delta);
-             icmp->checksum = ip_csum_fold (icmp_sum);
+                                        1 /* is_icmp_inner_ip4 */,
+                                        0 /* skip_saddr_rewrite */);
+             new_icmp_sum = ip_csum_sub_even (old_icmp_sum, f->l3_csum_delta);
+             new_icmp_sum = ip_csum_sub_even (new_icmp_sum, f->l4_csum_delta);
+             new_icmp_sum =
+               ip_csum_update (new_icmp_sum, old_inner_ip_sum,
+                               inner_ip->checksum, ip4_header_t, checksum);
+             new_icmp_sum =
+               ip_csum_update (new_icmp_sum, old_tcp_sum, tcp->checksum,
+                               tcp_header_t, checksum);
+             new_icmp_sum = ip_csum_fold (new_icmp_sum);
+             icmp->checksum = new_icmp_sum;
              break;
-           case NAT_PROTOCOL_ICMP:
+           case IP_PROTOCOL_ICMP:
+             nat_6t_flow_ip4_translate (sm, b, inner_ip, f, inner_proto,
+                                        1 /* is_icmp_inner_ip4 */,
+                                        0 /* skip_saddr_rewrite */);
              if (f->ops & NAT_FLOW_OP_ICMP_ID_REWRITE)
                {
                  icmp46_header_t *inner_icmp = ip4_next_header (inner_ip);
+                 if (!it_fits (vm, b, inner_icmp, sizeof (*inner_icmp)))
+                   {
+                     return NAT_ED_TRNSL_ERR_PACKET_TRUNCATED;
+                   }
                  icmp_echo_header_t *inner_echo =
                    (icmp_echo_header_t *) (inner_icmp + 1);
                  if (f->rewrite.icmp_id != inner_echo->identifier)
@@ -3417,29 +3835,66 @@ nat_6t_flow_icmp_translate (snat_main_t *sm, vlib_buffer_t *b,
            }
        }
     }
+
   return NAT_ED_TRNSL_ERR_SUCCESS;
 }
 
-nat_translation_error_e
-nat_6t_flow_buf_translate (snat_main_t *sm, vlib_buffer_t *b, ip4_header_t *ip,
-                          nat_6t_flow_t *f, nat_protocol_t proto,
-                          int is_output_feature)
+static_always_inline nat_translation_error_e
+nat_6t_flow_buf_translate (vlib_main_t *vm, snat_main_t *sm, vlib_buffer_t *b,
+                          ip4_header_t *ip, nat_6t_flow_t *f,
+                          ip_protocol_t proto, int is_output_feature,
+                          int is_i2o)
 {
   if (!is_output_feature && f->ops & NAT_FLOW_OP_TXFIB_REWRITE)
     {
       vnet_buffer (b)->sw_if_index[VLIB_TX] = f->rewrite.fib_index;
     }
 
-  nat_6t_flow_ip4_translate (sm, b, ip, f, proto, 0 /* is_icmp_inner_ip4 */);
-
-  if (NAT_PROTOCOL_ICMP == proto)
+  if (IP_PROTOCOL_ICMP == proto)
     {
-      return nat_6t_flow_icmp_translate (sm, b, ip, f);
+      if (ip->src_address.as_u32 != f->rewrite.saddr.as_u32)
+       {
+         // packet is returned from a router, not from destination
+         // skip source address rewrite if in o2i path
+         nat_6t_flow_ip4_translate (sm, b, ip, f, proto,
+                                    0 /* is_icmp_inner_ip4 */,
+                                    !is_i2o /* skip_saddr_rewrite */);
+       }
+      else
+       {
+         nat_6t_flow_ip4_translate (sm, b, ip, f, proto,
+                                    0 /* is_icmp_inner_ip4 */,
+                                    0 /* skip_saddr_rewrite */);
+       }
+      return nat_6t_flow_icmp_translate (vm, sm, b, ip, f);
     }
 
+  nat_6t_flow_ip4_translate (sm, b, ip, f, proto, 0 /* is_icmp_inner_ip4 */,
+                            0 /* skip_saddr_rewrite */);
+
   return NAT_ED_TRNSL_ERR_SUCCESS;
 }
 
+nat_translation_error_e
+nat_6t_flow_buf_translate_i2o (vlib_main_t *vm, snat_main_t *sm,
+                              vlib_buffer_t *b, ip4_header_t *ip,
+                              nat_6t_flow_t *f, ip_protocol_t proto,
+                              int is_output_feature)
+{
+  return nat_6t_flow_buf_translate (vm, sm, b, ip, f, proto, is_output_feature,
+                                   1 /* is_i2o */);
+}
+
+nat_translation_error_e
+nat_6t_flow_buf_translate_o2i (vlib_main_t *vm, snat_main_t *sm,
+                              vlib_buffer_t *b, ip4_header_t *ip,
+                              nat_6t_flow_t *f, ip_protocol_t proto,
+                              int is_output_feature)
+{
+  return nat_6t_flow_buf_translate (vm, sm, b, ip, f, proto, is_output_feature,
+                                   0 /* is_i2o */);
+}
+
 u8 *
 format_nat_6t (u8 *s, va_list *args)
 {
@@ -3469,6 +3924,15 @@ format_nat_ed_translation_error (u8 *s, va_list *args)
     case NAT_ED_TRNSL_ERR_FLOW_MISMATCH:
       s = format (s, "flow-mismatch");
       break;
+    case NAT_ED_TRNSL_ERR_PACKET_TRUNCATED:
+      s = format (s, "packet-truncated");
+      break;
+    case NAT_ED_TRNSL_ERR_INNER_IP_CORRUPT:
+      s = format (s, "inner-ip-corrupted");
+      break;
+    case NAT_ED_TRNSL_ERR_INVALID_CSUM:
+      s = format (s, "invalid-checksum");
+      break;
     }
   return s;
 }
@@ -3534,6 +3998,126 @@ format_nat_6t_flow (u8 *s, va_list *args)
   return s;
 }
 
+static inline void
+nat_syslog_nat44_sess (u32 ssubix, u32 sfibix, ip4_address_t *isaddr,
+                      u16 isport, ip4_address_t *xsaddr, u16 xsport,
+                      ip4_address_t *idaddr, u16 idport,
+                      ip4_address_t *xdaddr, u16 xdport, u8 proto, u8 is_add,
+                      u8 is_twicenat)
+{
+  syslog_msg_t syslog_msg;
+  fib_table_t *fib;
+
+  if (!syslog_is_enabled ())
+    return;
+
+  if (syslog_severity_filter_block (SADD_SDEL_SEVERITY))
+    return;
+
+  fib = fib_table_get (sfibix, FIB_PROTOCOL_IP4);
+
+  syslog_msg_init (&syslog_msg, NAT_FACILITY, SADD_SDEL_SEVERITY, NAT_APPNAME,
+                  is_add ? SADD_MSGID : SDEL_MSGID);
+
+  syslog_msg_sd_init (&syslog_msg, NSESS_SDID);
+  syslog_msg_add_sd_param (&syslog_msg, SSUBIX_SDPARAM_NAME, "%d", ssubix);
+  syslog_msg_add_sd_param (&syslog_msg, SVLAN_SDPARAM_NAME, "%d",
+                          fib->ft_table_id);
+  syslog_msg_add_sd_param (&syslog_msg, IATYP_SDPARAM_NAME, IATYP_IPV4);
+  syslog_msg_add_sd_param (&syslog_msg, ISADDR_SDPARAM_NAME, "%U",
+                          format_ip4_address, isaddr);
+  syslog_msg_add_sd_param (&syslog_msg, ISPORT_SDPARAM_NAME, "%d",
+                          clib_net_to_host_u16 (isport));
+  syslog_msg_add_sd_param (&syslog_msg, XATYP_SDPARAM_NAME, IATYP_IPV4);
+  syslog_msg_add_sd_param (&syslog_msg, XSADDR_SDPARAM_NAME, "%U",
+                          format_ip4_address, xsaddr);
+  syslog_msg_add_sd_param (&syslog_msg, XSPORT_SDPARAM_NAME, "%d",
+                          clib_net_to_host_u16 (xsport));
+  syslog_msg_add_sd_param (&syslog_msg, PROTO_SDPARAM_NAME, "%d", proto);
+  syslog_msg_add_sd_param (&syslog_msg, XDADDR_SDPARAM_NAME, "%U",
+                          format_ip4_address, xdaddr);
+  syslog_msg_add_sd_param (&syslog_msg, XDPORT_SDPARAM_NAME, "%d",
+                          clib_net_to_host_u16 (xdport));
+  if (is_twicenat)
+    {
+      syslog_msg_add_sd_param (&syslog_msg, IDADDR_SDPARAM_NAME, "%U",
+                              format_ip4_address, idaddr);
+      syslog_msg_add_sd_param (&syslog_msg, IDPORT_SDPARAM_NAME, "%d",
+                              clib_net_to_host_u16 (idport));
+    }
+
+  syslog_msg_send (&syslog_msg);
+}
+
+void
+nat_syslog_nat44_sadd (u32 ssubix, u32 sfibix, ip4_address_t *isaddr,
+                      u16 isport, ip4_address_t *idaddr, u16 idport,
+                      ip4_address_t *xsaddr, u16 xsport,
+                      ip4_address_t *xdaddr, u16 xdport, u8 proto,
+                      u8 is_twicenat)
+{
+  nat_syslog_nat44_sess (ssubix, sfibix, isaddr, isport, xsaddr, xsport,
+                        idaddr, idport, xdaddr, xdport, proto, 1,
+                        is_twicenat);
+}
+
+void
+nat_syslog_nat44_sdel (u32 ssubix, u32 sfibix, ip4_address_t *isaddr,
+                      u16 isport, ip4_address_t *idaddr, u16 idport,
+                      ip4_address_t *xsaddr, u16 xsport,
+                      ip4_address_t *xdaddr, u16 xdport, u8 proto,
+                      u8 is_twicenat)
+{
+  nat_syslog_nat44_sess (ssubix, sfibix, isaddr, isport, xsaddr, xsport,
+                        idaddr, idport, xdaddr, xdport, proto, 0,
+                        is_twicenat);
+}
+
+u8 *
+format_nat44_ed_tcp_state (u8 *s, va_list *args)
+{
+  nat44_ed_tcp_state_e e = va_arg (*args, nat44_ed_tcp_state_e);
+  switch (e)
+    {
+    case NAT44_ED_TCP_STATE_CLOSED:
+      s = format (s, "closed");
+      break;
+    case NAT44_ED_TCP_STATE_SYN_I2O:
+      s = format (s, "SYN seen in in2out direction");
+      break;
+    case NAT44_ED_TCP_STATE_SYN_O2I:
+      s = format (s, "SYN seen in out2in direction");
+      break;
+    case NAT44_ED_TCP_STATE_ESTABLISHED:
+      s = format (s, "SYN seen in both directions/established");
+      break;
+    case NAT44_ED_TCP_STATE_FIN_I2O:
+      s = format (s, "FIN seen in in2out direction");
+      break;
+    case NAT44_ED_TCP_STATE_FIN_O2I:
+      s = format (s, "FIN seen in out2in direction");
+      break;
+    case NAT44_ED_TCP_STATE_RST_TRANS:
+      s = format (s, "RST seen/transitory timeout");
+      break;
+    case NAT44_ED_TCP_STATE_FIN_TRANS:
+      s = format (s, "FIN seen in both directions/transitory timeout");
+      break;
+    case NAT44_ED_TCP_STATE_FIN_REOPEN_SYN_O2I:
+      s = format (s, "FIN seen in both directions/transitory timeout/session "
+                    "reopening in out2in direction");
+      break;
+    case NAT44_ED_TCP_STATE_FIN_REOPEN_SYN_I2O:
+      s = format (s, "FIN seen in both directions/transitory timeout/session "
+                    "reopening in in2out direction");
+      break;
+    case NAT44_ED_TCP_N_STATE:
+      s = format (s, "BUG! unexpected N_STATE! BUG!");
+      break;
+    }
+  return s;
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *