NAT: VPP-1531 api cleanup & update
[vpp.git] / src / plugins / nat / nat_api.c
index bc192a7..5c6d957 100644 (file)
 #include <nat/nat.h>
 #include <nat/nat_det.h>
 #include <nat/nat64.h>
+#include <nat/nat66.h>
 #include <nat/dslite.h>
 #include <nat/nat_reass.h>
+#include <nat/nat_inlines.h>
+#include <nat/nat_ha.h>
 #include <vlibapi/api.h>
 #include <vlibmemory/api.h>
 
 #include <nat/nat_msg_enum.h>
 #include <vnet/fib/fib_table.h>
+#include <vnet/ip/ip_types_api.h>
 
 #define vl_api_nat44_lb_addr_port_t_endian vl_noop_handler
 #define vl_api_nat44_add_del_lb_static_mapping_t_endian vl_noop_handler
@@ -60,7 +64,6 @@
     vec_free (s);                               \
     return handle;
 
-
 /******************************/
 /*** Common NAT plugin APIs ***/
 /******************************/
@@ -95,6 +98,8 @@ vl_api_nat_show_config_t_handler (vl_api_nat_show_config_t * mp)
 {
   vl_api_nat_show_config_reply_t *rmp;
   snat_main_t *sm = &snat_main;
+  dslite_main_t *dm = &dslite_main;
+  nat64_main_t *n64m = &nat64_main;
   int rv = 0;
 
   /* *INDENT-OFF* */
@@ -111,6 +116,13 @@ vl_api_nat_show_config_t_handler (vl_api_nat_show_config_t * mp)
     rmp->static_mapping_connection_tracking =
       sm->static_mapping_connection_tracking;
     rmp->deterministic = sm->deterministic;
+    rmp->endpoint_dependent = sm->endpoint_dependent;
+    rmp->out2in_dpo = sm->out2in_dpo;
+    rmp->dslite_ce = dm->is_ce;
+    rmp->nat64_bib_buckets = n64m->bib_buckets;
+    rmp->nat64_bib_memory_size = n64m->bib_memory_size;
+    rmp->nat64_st_buckets = n64m->st_buckets;
+    rmp->nat64_st_memory_size = n64m->st_memory_size;
   }));
   /* *INDENT-ON* */
 }
@@ -132,7 +144,15 @@ vl_api_nat_set_workers_t_handler (vl_api_nat_set_workers_t * mp)
   vl_api_nat_set_workers_reply_t *rmp;
   int rv = 0;
   uword *bitmap = 0;
-  u64 mask = clib_net_to_host_u64 (mp->worker_mask);
+  u64 mask;
+
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  mask = clib_net_to_host_u64 (mp->worker_mask);
 
   if (sm->num_workers < 2)
     {
@@ -174,38 +194,48 @@ vl_api_nat_set_workers_t_print (vl_api_nat_set_workers_t * mp, void *handle)
 }
 
 static void
-send_nat_worker_details (u32 worker_index, svm_queue_t * q, u32 context)
+send_nat_worker_details (u32 worker_index, vl_api_registration_t * reg,
+                        u32 context)
 {
   vl_api_nat_worker_details_t *rmp;
   snat_main_t *sm = &snat_main;
   vlib_worker_thread_t *w =
     vlib_worker_threads + worker_index + sm->first_worker_index;
+  u32 len = vec_len (w->name);
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  if (len)
+    --len;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp) + len);
+  clib_memset (rmp, 0, sizeof (*rmp) + len);
   rmp->_vl_msg_id = ntohs (VL_API_NAT_WORKER_DETAILS + sm->msg_id_base);
   rmp->context = context;
   rmp->worker_index = htonl (worker_index);
-  rmp->lcore_id = htonl (w->lcore_id);
-  strncpy ((char *) rmp->name, (char *) w->name, ARRAY_LEN (rmp->name) - 1);
+  rmp->lcore_id = htonl (w->cpu_id);
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  if (len)
+    vl_api_to_api_string (len, (char *) w->name, &rmp->name);
+
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat_worker_dump_t_handler (vl_api_nat_worker_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   u32 *worker_index;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   vec_foreach (worker_index, sm->workers)
-    send_nat_worker_details(*worker_index, q, mp->context);
+    send_nat_worker_details(*worker_index, reg, mp->context);
   /* *INDENT-ON* */
 }
 
@@ -315,7 +345,7 @@ vl_api_nat_get_reass_t_print (vl_api_nat_get_reass_t * mp, void *handle)
 
 typedef struct nat_api_walk_ctx_t_
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   u32 context;
 } nat_api_walk_ctx_t;
 
@@ -325,19 +355,24 @@ nat_ip4_reass_walk_api (nat_reass_ip4_t * reass, void *arg)
   vl_api_nat_reass_details_t *rmp;
   snat_main_t *sm = &snat_main;
   nat_api_walk_ctx_t *ctx = arg;
+  ip46_address_t ip_address;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT_REASS_DETAILS + sm->msg_id_base);
   rmp->context = ctx->context;
-  clib_memcpy (rmp->src_addr, &(reass->key.src), 4);
-  clib_memcpy (rmp->dst_addr, &(reass->key.dst), 4);
+
+  clib_memcpy (&ip_address.ip4, &reass->key.src, 4);
+  ip_address_encode (&ip_address, IP46_TYPE_IP4, &rmp->src_addr);
+
+  clib_memcpy (&ip_address.ip4, &reass->key.dst, 4);
+  ip_address_encode (&ip_address, IP46_TYPE_IP4, &rmp->dst_addr);
+
   rmp->proto = reass->key.proto;
   rmp->frag_id = ntohl (reass->key.frag_id);
   rmp->frag_n = reass->frag_n;
-  rmp->is_ip4 = 1;
 
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
   return 0;
 }
@@ -348,19 +383,24 @@ nat_ip6_reass_walk_api (nat_reass_ip6_t * reass, void *arg)
   vl_api_nat_reass_details_t *rmp;
   snat_main_t *sm = &snat_main;
   nat_api_walk_ctx_t *ctx = arg;
+  ip46_address_t ip_address;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT_REASS_DETAILS + sm->msg_id_base);
   rmp->context = ctx->context;
-  clib_memcpy (rmp->src_addr, &(reass->key.src), 16);
-  clib_memcpy (rmp->dst_addr, &(reass->key.dst), 16);
+
+  clib_memcpy (&ip_address.ip6, &reass->key.src, 16);
+  ip_address_encode (&ip_address, IP46_TYPE_IP6, &rmp->src_addr);
+
+  clib_memcpy (&ip_address.ip6, &reass->key.dst, 16);
+  ip_address_encode (&ip_address, IP46_TYPE_IP6, &rmp->dst_addr);
+
   rmp->proto = reass->key.proto;
   rmp->frag_id = ntohl (reass->key.frag_id);
   rmp->frag_n = reass->frag_n;
-  rmp->is_ip4 = 0;
 
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
   return 0;
 }
@@ -368,14 +408,14 @@ nat_ip6_reass_walk_api (nat_reass_ip6_t * reass, void *arg)
 static void
 vl_api_nat_reass_dump_t_handler (vl_api_nat_reass_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   nat_api_walk_ctx_t ctx = {
-    .q = q,
+    .reg = reg,
     .context = mp->context,
   };
 
@@ -393,323 +433,796 @@ vl_api_nat_reass_dump_t_print (vl_api_nat_reass_dump_t * mp, void *handle)
   FINISH;
 }
 
-/*************/
-/*** NAT44 ***/
-/*************/
 static void
-  vl_api_nat44_add_del_address_range_t_handler
-  (vl_api_nat44_add_del_address_range_t * mp)
+vl_api_nat_set_timeouts_t_handler (vl_api_nat_set_timeouts_t * mp)
 {
   snat_main_t *sm = &snat_main;
-  vl_api_nat44_add_del_address_range_reply_t *rmp;
-  ip4_address_t this_addr;
-  u32 start_host_order, end_host_order;
-  u32 vrf_id;
-  int i, count;
+  vl_api_nat_set_timeouts_reply_t *rmp;
   int rv = 0;
-  u32 *tmp;
-
-  if (sm->static_mapping_only)
-    {
-      rv = VNET_API_ERROR_FEATURE_DISABLED;
-      goto send_reply;
-    }
-
-  tmp = (u32 *) mp->first_ip_address;
-  start_host_order = clib_host_to_net_u32 (tmp[0]);
-  tmp = (u32 *) mp->last_ip_address;
-  end_host_order = clib_host_to_net_u32 (tmp[0]);
-
-  count = (end_host_order - start_host_order) + 1;
 
-  vrf_id = clib_host_to_net_u32 (mp->vrf_id);
+  sm->udp_timeout = ntohl (mp->udp);
+  sm->tcp_established_timeout = ntohl (mp->tcp_established);
+  sm->tcp_transitory_timeout = ntohl (mp->tcp_transitory);
+  sm->icmp_timeout = ntohl (mp->icmp);
 
-  if (count > 1024)
-    clib_warning ("%U - %U, %d addresses...",
-                 format_ip4_address, mp->first_ip_address,
-                 format_ip4_address, mp->last_ip_address, count);
+  rv = nat64_set_icmp_timeout (ntohl (mp->icmp));
+  if (rv)
+    goto send_reply;
+  rv = nat64_set_udp_timeout (ntohl (mp->udp));
+  if (rv)
+    goto send_reply;
+  rv =
+    nat64_set_tcp_timeouts (ntohl (mp->tcp_transitory),
+                           ntohl (mp->tcp_established));
 
-  memcpy (&this_addr.as_u8, mp->first_ip_address, 4);
+send_reply:
+  REPLY_MACRO (VL_API_NAT_SET_TIMEOUTS_REPLY);
+}
 
-  for (i = 0; i < count; i++)
-    {
-      if (mp->is_add)
-       snat_add_address (sm, &this_addr, vrf_id, mp->twice_nat);
-      else
-       rv = snat_del_address (sm, this_addr, 0, mp->twice_nat);
+static void *
+vl_api_nat_set_timeouts_t_print (vl_api_nat_set_timeouts_t * mp, void *handle)
+{
+  u8 *s;
 
-      if (rv)
-       goto send_reply;
+  s = format (0, "SCRIPT: nat_set_timeouts ");
+  s = format (s, "udp %d tcp_established %d tcp_transitory %d icmp %d\n",
+             ntohl (mp->udp),
+             ntohl (mp->tcp_established),
+             ntohl (mp->tcp_transitory), ntohl (mp->icmp));
 
-      if (sm->out2in_dpo)
-       nat44_add_del_address_dpo (this_addr, mp->is_add);
+  FINISH;
+}
 
-      increment_v4_address (&this_addr);
-    }
+static void
+vl_api_nat_get_timeouts_t_handler (vl_api_nat_get_timeouts_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat_get_timeouts_reply_t *rmp;
+  int rv = 0;
 
-send_reply:
-  REPLY_MACRO (VL_API_NAT44_ADD_DEL_ADDRESS_RANGE_REPLY);
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_NAT_GET_TIMEOUTS_REPLY,
+  ({
+    rmp->udp = htonl (sm->udp_timeout);
+    rmp->tcp_established = htonl (sm->tcp_established_timeout);
+    rmp->tcp_transitory = htonl (sm->tcp_transitory_timeout);
+    rmp->icmp = htonl (sm->icmp_timeout);
+  }))
+  /* *INDENT-ON* */
 }
 
-static void *vl_api_nat44_add_del_address_range_t_print
-  (vl_api_nat44_add_del_address_range_t * mp, void *handle)
+static void *
+vl_api_nat_get_timeouts_t_print (vl_api_nat_get_timeouts_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat44_add_address_range ");
-  s = format (s, "%U ", format_ip4_address, mp->first_ip_address);
-  if (memcmp (mp->first_ip_address, mp->last_ip_address, 4))
-    {
-      s = format (s, " - %U ", format_ip4_address, mp->last_ip_address);
-    }
-  s = format (s, "twice_nat %d ", mp->twice_nat);
+  s = format (0, "SCRIPT: nat_get_timeouts");
+
   FINISH;
 }
 
 static void
-send_nat44_address_details (snat_address_t * a,
-                           svm_queue_t * q, u32 context, u8 twice_nat)
+  vl_api_nat_set_addr_and_port_alloc_alg_t_handler
+  (vl_api_nat_set_addr_and_port_alloc_alg_t * mp)
 {
-  vl_api_nat44_address_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  vl_api_nat_set_addr_and_port_alloc_alg_reply_t *rmp;
+  int rv = 0;
+  u16 port_start, port_end;
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_NAT44_ADDRESS_DETAILS + sm->msg_id_base);
-  clib_memcpy (rmp->ip_address, &(a->addr), 4);
-  if (a->fib_index != ~0)
+  if (sm->deterministic)
     {
-      fib_table_t *fib = fib_table_get (a->fib_index, FIB_PROTOCOL_IP4);
-      rmp->vrf_id = ntohl (fib->ft_table_id);
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
     }
-  else
-    rmp->vrf_id = ~0;
-  rmp->twice_nat = twice_nat;
-  rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  switch (mp->alg)
+    {
+    case NAT_ADDR_AND_PORT_ALLOC_ALG_DEFAULT:
+      nat_set_alloc_addr_and_port_default ();
+      break;
+    case NAT_ADDR_AND_PORT_ALLOC_ALG_MAPE:
+      nat_set_alloc_addr_and_port_mape (ntohs (mp->psid), mp->psid_offset,
+                                       mp->psid_length);
+      break;
+    case NAT_ADDR_AND_PORT_ALLOC_ALG_RANGE:
+      port_start = ntohs (mp->start_port);
+      port_end = ntohs (mp->end_port);
+      if (port_end <= port_start)
+       {
+         rv = VNET_API_ERROR_INVALID_VALUE;
+         goto send_reply;
+       }
+      nat_set_alloc_addr_and_port_range (port_start, port_end);
+      break;
+    default:
+      rv = VNET_API_ERROR_INVALID_VALUE;
+      break;
+    }
+
+send_reply:
+  REPLY_MACRO (VL_API_NAT_SET_ADDR_AND_PORT_ALLOC_ALG_REPLY);
+}
+
+static void *vl_api_nat_set_addr_and_port_alloc_alg_t_print
+  (vl_api_nat_set_addr_and_port_alloc_alg_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat_set_addr_and_port_alloc_alg ");
+  s = format (s, "alg %d psid_offset %d psid_length %d psid %d start_port %d "
+             "end_port %d\n",
+             ntohl (mp->alg), ntohl (mp->psid_offset),
+             ntohl (mp->psid_length), ntohs (mp->psid),
+             ntohs (mp->start_port), ntohs (mp->end_port));
+
+  FINISH;
 }
 
 static void
-vl_api_nat44_address_dump_t_handler (vl_api_nat44_address_dump_t * mp)
+  vl_api_nat_get_addr_and_port_alloc_alg_t_handler
+  (vl_api_nat_get_addr_and_port_alloc_alg_t * mp)
 {
-  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
-  snat_address_t *a;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
+  vl_api_nat_get_addr_and_port_alloc_alg_reply_t *rmp;
+  int rv = 0;
 
   /* *INDENT-OFF* */
-  vec_foreach (a, sm->addresses)
-    send_nat44_address_details (a, q, mp->context, 0);
-  vec_foreach (a, sm->twice_nat_addresses)
-    send_nat44_address_details (a, q, mp->context, 1);
+  REPLY_MACRO2 (VL_API_NAT_GET_ADDR_AND_PORT_ALLOC_ALG_REPLY,
+  ({
+    rmp->alg = sm->addr_and_port_alloc_alg;
+    rmp->psid_offset = sm->psid_offset;
+    rmp->psid_length = sm->psid_length;
+    rmp->psid = htons (sm->psid);
+    rmp->start_port = htons (sm->start_port);
+    rmp->end_port = htons (sm->end_port);
+  }))
   /* *INDENT-ON* */
 }
 
-static void *
-vl_api_nat44_address_dump_t_print (vl_api_nat44_address_dump_t * mp,
-                                  void *handle)
+static void *vl_api_nat_get_addr_and_port_alloc_alg_t_print
+  (vl_api_nat_get_addr_and_port_alloc_alg_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat44_address_dump ");
+  s = format (0, "SCRIPT: nat_get_addr_and_port_alloc_alg");
 
   FINISH;
 }
 
 static void
-  vl_api_nat44_interface_add_del_feature_t_handler
-  (vl_api_nat44_interface_add_del_feature_t * mp)
+vl_api_nat_set_mss_clamping_t_handler (vl_api_nat_set_mss_clamping_t * mp)
 {
   snat_main_t *sm = &snat_main;
-  vl_api_nat44_interface_add_del_feature_reply_t *rmp;
-  u8 is_del = mp->is_add == 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
+  vl_api_nat_set_mss_clamping_reply_t *rmp;
   int rv = 0;
 
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = snat_interface_add_del (sw_if_index, mp->is_inside, is_del);
-
-  BAD_SW_IF_INDEX_LABEL;
+  if (mp->enable)
+    {
+      sm->mss_clamping = ntohs (mp->mss_value);
+      sm->mss_value_net = mp->mss_value;
+    }
+  else
+    sm->mss_clamping = 0;
 
-  REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_FEATURE_REPLY);
+  REPLY_MACRO (VL_API_NAT_SET_MSS_CLAMPING_REPLY);
 }
 
-static void *vl_api_nat44_interface_add_del_feature_t_print
-  (vl_api_nat44_interface_add_del_feature_t * mp, void *handle)
+static void *
+vl_api_nat_set_mss_clamping_t_print (vl_api_nat_set_mss_clamping_t * mp,
+                                    void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat44_interface_add_del_feature ");
-  s = format (s, "sw_if_index %d %s %s",
-             clib_host_to_net_u32 (mp->sw_if_index),
-             mp->is_inside ? "in" : "out", mp->is_add ? "" : "del");
+  s = format (0, "SCRIPT: nat_set_mss_clamping enable %d mss_value %d\n",
+             mp->enable, ntohs (mp->mss_value));
 
   FINISH;
 }
 
 static void
-send_nat44_interface_details (snat_interface_t * i,
-                             svm_queue_t * q, u32 context)
+vl_api_nat_get_mss_clamping_t_handler (vl_api_nat_get_mss_clamping_t * mp)
 {
-  vl_api_nat44_interface_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  vl_api_nat_get_mss_clamping_reply_t *rmp;
+  int rv = 0;
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_NAT44_INTERFACE_DETAILS + sm->msg_id_base);
-  rmp->sw_if_index = ntohl (i->sw_if_index);
-  rmp->is_inside = (nat_interface_is_inside (i)
-                   && nat_interface_is_outside (i)) ? 2 :
-    nat_interface_is_inside (i);
-  rmp->context = context;
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_NAT_GET_MSS_CLAMPING_REPLY,
+  ({
+    rmp->enable = sm->mss_clamping ? 1 : 0;
+    rmp->mss_value = htons (sm->mss_clamping);
+  }))
+  /* *INDENT-ON* */
+}
+
+static void *
+vl_api_nat_get_mss_clamping_t_print (vl_api_nat_get_mss_clamping_t * mp,
+                                    void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat_get_mss_clamping");
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  FINISH;
 }
 
 static void
-vl_api_nat44_interface_dump_t_handler (vl_api_nat44_interface_dump_t * mp)
+vl_api_nat_ha_set_listener_t_handler (vl_api_nat_ha_set_listener_t * mp)
 {
-  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
-  snat_interface_t *i;
+  vl_api_nat_ha_set_listener_reply_t *rmp;
+  ip4_address_t addr;
+  int rv;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
+  memcpy (&addr, &mp->ip_address, sizeof (addr));
+  rv =
+    nat_ha_set_listener (&addr, clib_net_to_host_u16 (mp->port),
+                        clib_net_to_host_u32 (mp->path_mtu));
 
-  /* *INDENT-OFF* */
-  pool_foreach (i, sm->interfaces,
-  ({
-    send_nat44_interface_details(i, q, mp->context);
-  }));
-  /* *INDENT-ON* */
+  REPLY_MACRO (VL_API_NAT_HA_SET_LISTENER_REPLY);
 }
 
 static void *
-vl_api_nat44_interface_dump_t_print (vl_api_nat44_interface_dump_t * mp,
-                                    void *handle)
+vl_api_nat_ha_set_listener_t_print (vl_api_nat_ha_set_listener_t * mp,
+                                   void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat44_interface_dump ");
+  s = format (0, "SCRIPT: nat_ha_set_listener ");
+  s = format (s, "ip_address %U ", format_ip4_address, mp->ip_address);
+  s = format (s, "port %d ", clib_net_to_host_u16 (mp->port));
+  s = format (s, "path_mtu %d", clib_net_to_host_u32 (mp->path_mtu));
 
   FINISH;
 }
 
 static void
-  vl_api_nat44_interface_add_del_output_feature_t_handler
-  (vl_api_nat44_interface_add_del_output_feature_t * mp)
+vl_api_nat_ha_get_listener_t_handler (vl_api_nat_ha_get_listener_t * mp)
 {
   snat_main_t *sm = &snat_main;
-  vl_api_nat44_interface_add_del_output_feature_reply_t *rmp;
-  u8 is_del = mp->is_add == 0;
-  u32 sw_if_index = ntohl (mp->sw_if_index);
+  vl_api_nat_ha_get_listener_reply_t *rmp;
   int rv = 0;
+  ip4_address_t addr;
+  u16 port;
+  u32 path_mtu;
 
-  VALIDATE_SW_IF_INDEX (mp);
-
-  rv = snat_interface_add_del_output_feature (sw_if_index, mp->is_inside,
-                                             is_del);
-
-  BAD_SW_IF_INDEX_LABEL;
+  nat_ha_get_listener (&addr, &port, &path_mtu);
 
-  REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE_REPLY);
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_NAT_HA_GET_LISTENER_REPLY,
+  ({
+    clib_memcpy (rmp->ip_address, &addr, sizeof (ip4_address_t));
+    rmp->port = clib_host_to_net_u16 (port);
+    rmp->path_mtu = clib_host_to_net_u32 (path_mtu);
+  }))
+  /* *INDENT-ON* */
 }
 
-static void *vl_api_nat44_interface_add_del_output_feature_t_print
-  (vl_api_nat44_interface_add_del_output_feature_t * mp, void *handle)
+static void *
+vl_api_nat_ha_get_listener_t_print (vl_api_nat_ha_get_listener_t * mp,
+                                   void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat44_interface_add_del_output_feature ");
-  s = format (s, "sw_if_index %d %s %s",
-             clib_host_to_net_u32 (mp->sw_if_index),
-             mp->is_inside ? "in" : "out", mp->is_add ? "" : "del");
+  s = format (0, "SCRIPT: nat_ha_get_listener");
 
   FINISH;
 }
 
 static void
-send_nat44_interface_output_feature_details (snat_interface_t * i,
-                                            svm_queue_t * q, u32 context)
+vl_api_nat_ha_set_failover_t_handler (vl_api_nat_ha_set_failover_t * mp)
 {
-  vl_api_nat44_interface_output_feature_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  vl_api_nat_ha_set_failover_reply_t *rmp;
+  ip4_address_t addr;
+  int rv;
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id =
-    ntohs (VL_API_NAT44_INTERFACE_OUTPUT_FEATURE_DETAILS + sm->msg_id_base);
-  rmp->sw_if_index = ntohl (i->sw_if_index);
-  rmp->context = context;
-  rmp->is_inside = nat_interface_is_inside (i);
+  memcpy (&addr, &mp->ip_address, sizeof (addr));
+  rv =
+    nat_ha_set_failover (&addr, clib_net_to_host_u16 (mp->port),
+                        clib_net_to_host_u32 (mp->session_refresh_interval));
+
+  REPLY_MACRO (VL_API_NAT_HA_SET_FAILOVER_REPLY);
+}
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+static void *
+vl_api_nat_ha_set_failover_t_print (vl_api_nat_ha_set_failover_t * mp,
+                                   void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat_ha_set_failover ");
+  s = format (s, "ip_address %U ", format_ip4_address, mp->ip_address);
+  s = format (s, "port %d ", clib_net_to_host_u16 (mp->port));
+
+  FINISH;
 }
 
 static void
-  vl_api_nat44_interface_output_feature_dump_t_handler
-  (vl_api_nat44_interface_output_feature_dump_t * mp)
+vl_api_nat_ha_get_failover_t_handler (vl_api_nat_ha_get_failover_t * mp)
 {
-  svm_queue_t *q;
   snat_main_t *sm = &snat_main;
-  snat_interface_t *i;
+  vl_api_nat_ha_get_failover_reply_t *rmp;
+  int rv = 0;
+  ip4_address_t addr;
+  u16 port;
+  u32 session_refresh_interval;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
+  nat_ha_get_failover (&addr, &port, &session_refresh_interval);
 
   /* *INDENT-OFF* */
-  pool_foreach (i, sm->output_feature_interfaces,
+  REPLY_MACRO2 (VL_API_NAT_HA_GET_FAILOVER_REPLY,
   ({
-    send_nat44_interface_output_feature_details(i, q, mp->context);
-  }));
+    clib_memcpy (rmp->ip_address, &addr, sizeof (ip4_address_t));
+    rmp->port = clib_host_to_net_u16 (port);
+    rmp->session_refresh_interval = clib_host_to_net_u32 (session_refresh_interval);
+  }))
   /* *INDENT-ON* */
 }
 
-static void *vl_api_nat44_interface_output_feature_dump_t_print
-  (vl_api_nat44_interface_output_feature_dump_t * mp, void *handle)
+static void *
+vl_api_nat_ha_get_failover_t_print (vl_api_nat_ha_get_failover_t * mp,
+                                   void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat44_interface_output_feature_dump ");
+  s = format (0, "SCRIPT: nat_ha_get_failover");
 
   FINISH;
 }
 
 static void
-  vl_api_nat44_add_del_static_mapping_t_handler
-  (vl_api_nat44_add_del_static_mapping_t * mp)
+vl_api_nat_ha_flush_t_handler (vl_api_nat_ha_flush_t * mp)
 {
   snat_main_t *sm = &snat_main;
-  vl_api_nat44_add_del_static_mapping_reply_t *rmp;
-  ip4_address_t local_addr, external_addr;
-  u16 local_port = 0, external_port = 0;
-  u32 vrf_id, external_sw_if_index;
+  vl_api_nat_ha_flush_reply_t *rmp;
   int rv = 0;
-  snat_protocol_t proto;
 
-  memcpy (&local_addr.as_u8, mp->local_ip_address, 4);
-  memcpy (&external_addr.as_u8, mp->external_ip_address, 4);
-  if (mp->addr_only == 0)
-    {
+  nat_ha_flush (0);
+
+  REPLY_MACRO (VL_API_NAT_HA_FLUSH_REPLY);
+}
+
+static void *
+vl_api_nat_ha_flush_t_print (vl_api_nat_ha_flush_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat_ha_flush ");
+
+  FINISH;
+}
+
+static void
+nat_ha_resync_completed_event_cb (u32 client_index, u32 pid, u32 missed_count)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_registration_t *reg;
+  vl_api_nat_ha_resync_completed_event_t *mp;
+
+  reg = vl_api_client_index_to_registration (client_index);
+  if (!reg)
+    return;
+
+  mp = vl_msg_api_alloc (sizeof (*mp));
+  clib_memset (mp, 0, sizeof (*mp));
+  mp->client_index = client_index;
+  mp->pid = pid;
+  mp->missed_count = clib_host_to_net_u32 (missed_count);
+  mp->_vl_msg_id =
+    ntohs (VL_API_NAT_HA_RESYNC_COMPLETED_EVENT + sm->msg_id_base);
+
+  vl_api_send_msg (reg, (u8 *) mp);
+}
+
+static void
+vl_api_nat_ha_resync_t_handler (vl_api_nat_ha_resync_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat_ha_resync_reply_t *rmp;
+  int rv;
+
+  rv =
+    nat_ha_resync (mp->client_index, mp->pid,
+                  mp->want_resync_event ? nat_ha_resync_completed_event_cb :
+                  NULL);
+
+  REPLY_MACRO (VL_API_NAT_HA_RESYNC_REPLY);
+}
+
+static void *
+vl_api_nat_ha_resync_t_print (vl_api_nat_ha_resync_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat_ha_resync ");
+  s =
+    format (s, "want_resync_event %d pid %d", mp->want_resync_event,
+           clib_host_to_net_u32 (mp->pid));
+
+  FINISH;
+}
+
+/*************/
+/*** NAT44 ***/
+/*************/
+static void
+  vl_api_nat44_add_del_address_range_t_handler
+  (vl_api_nat44_add_del_address_range_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat44_add_del_address_range_reply_t *rmp;
+  ip4_address_t this_addr;
+  u8 is_add, twice_nat;
+  u32 start_host_order, end_host_order;
+  u32 vrf_id;
+  int i, count;
+  int rv = 0;
+  u32 *tmp;
+
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  if (sm->static_mapping_only)
+    {
+      rv = VNET_API_ERROR_FEATURE_DISABLED;
+      goto send_reply;
+    }
+
+  is_add = mp->is_add;
+  twice_nat = mp->flags & NAT_API_IS_TWICE_NAT;
+
+  tmp = (u32 *) mp->first_ip_address;
+  start_host_order = clib_host_to_net_u32 (tmp[0]);
+  tmp = (u32 *) mp->last_ip_address;
+  end_host_order = clib_host_to_net_u32 (tmp[0]);
+
+  count = (end_host_order - start_host_order) + 1;
+
+  vrf_id = clib_host_to_net_u32 (mp->vrf_id);
+
+  if (count > 1024)
+    nat_log_info ("%U - %U, %d addresses...",
+                 format_ip4_address, mp->first_ip_address,
+                 format_ip4_address, mp->last_ip_address, count);
+
+  memcpy (&this_addr.as_u8, mp->first_ip_address, 4);
+
+  for (i = 0; i < count; i++)
+    {
+      if (is_add)
+       rv = snat_add_address (sm, &this_addr, vrf_id, twice_nat);
+      else
+       rv = snat_del_address (sm, this_addr, 0, twice_nat);
+
+      if (rv)
+       goto send_reply;
+
+      if (sm->out2in_dpo)
+       nat44_add_del_address_dpo (this_addr, is_add);
+
+      increment_v4_address (&this_addr);
+    }
+
+send_reply:
+  REPLY_MACRO (VL_API_NAT44_ADD_DEL_ADDRESS_RANGE_REPLY);
+}
+
+static void *vl_api_nat44_add_del_address_range_t_print
+  (vl_api_nat44_add_del_address_range_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_add_address_range ");
+  s = format (s, "%U ", format_ip4_address, mp->first_ip_address);
+  if (memcmp (mp->first_ip_address, mp->last_ip_address, 4))
+    {
+      s = format (s, " - %U ", format_ip4_address, mp->last_ip_address);
+    }
+  s = format (s, "twice_nat %d ", mp->flags & NAT_API_IS_TWICE_NAT);
+  FINISH;
+}
+
+static void
+send_nat44_address_details (snat_address_t * a,
+                           vl_api_registration_t * reg, u32 context,
+                           u8 twice_nat)
+{
+  vl_api_nat44_address_details_t *rmp;
+  snat_main_t *sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_NAT44_ADDRESS_DETAILS + sm->msg_id_base);
+  clib_memcpy (rmp->ip_address, &(a->addr), 4);
+  if (a->fib_index != ~0)
+    {
+      fib_table_t *fib = fib_table_get (a->fib_index, FIB_PROTOCOL_IP4);
+      rmp->vrf_id = ntohl (fib->ft_table_id);
+    }
+  else
+    rmp->vrf_id = ~0;
+  if (twice_nat)
+    rmp->flags |= NAT_API_IS_TWICE_NAT;
+  rmp->context = context;
+
+  vl_api_send_msg (reg, (u8 *) rmp);
+}
+
+static void
+vl_api_nat44_address_dump_t_handler (vl_api_nat44_address_dump_t * mp)
+{
+  vl_api_registration_t *reg;
+  snat_main_t *sm = &snat_main;
+  snat_address_t *a;
+
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  /* *INDENT-OFF* */
+  vec_foreach (a, sm->addresses)
+    send_nat44_address_details (a, reg, mp->context, 0);
+  vec_foreach (a, sm->twice_nat_addresses)
+    send_nat44_address_details (a, reg, mp->context, 1);
+  /* *INDENT-ON* */
+}
+
+static void *
+vl_api_nat44_address_dump_t_print (vl_api_nat44_address_dump_t * mp,
+                                  void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_address_dump ");
+
+  FINISH;
+}
+
+static void
+  vl_api_nat44_interface_add_del_feature_t_handler
+  (vl_api_nat44_interface_add_del_feature_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat44_interface_add_del_feature_reply_t *rmp;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  u8 is_del;
+  int rv = 0;
+
+  is_del = !mp->is_add;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv =
+    snat_interface_add_del (sw_if_index, mp->flags & NAT_API_IS_INSIDE,
+                           is_del);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_FEATURE_REPLY);
+}
+
+static void *vl_api_nat44_interface_add_del_feature_t_print
+  (vl_api_nat44_interface_add_del_feature_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_interface_add_del_feature ");
+  s = format (s, "sw_if_index %d %s %s",
+             clib_host_to_net_u32 (mp->sw_if_index),
+             mp->flags & NAT_API_IS_INSIDE ? "in" : "out",
+             mp->is_add ? "" : "del");
+
+  FINISH;
+}
+
+static void
+send_nat44_interface_details (snat_interface_t * i,
+                             vl_api_registration_t * reg, u32 context)
+{
+  vl_api_nat44_interface_details_t *rmp;
+  snat_main_t *sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_NAT44_INTERFACE_DETAILS + sm->msg_id_base);
+  rmp->sw_if_index = ntohl (i->sw_if_index);
+
+  if (nat_interface_is_inside (i))
+    rmp->flags |= NAT_API_IS_INSIDE;
+  if (nat_interface_is_outside (i))
+    rmp->flags |= NAT_API_IS_OUTSIDE;
+
+  rmp->context = context;
+
+  vl_api_send_msg (reg, (u8 *) rmp);
+}
+
+static void
+vl_api_nat44_interface_dump_t_handler (vl_api_nat44_interface_dump_t * mp)
+{
+  vl_api_registration_t *reg;
+  snat_main_t *sm = &snat_main;
+  snat_interface_t *i;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (i, sm->interfaces,
+  ({
+    send_nat44_interface_details(i, reg, mp->context);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void *
+vl_api_nat44_interface_dump_t_print (vl_api_nat44_interface_dump_t * mp,
+                                    void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_interface_dump ");
+
+  FINISH;
+}
+
+static void
+  vl_api_nat44_interface_add_del_output_feature_t_handler
+  (vl_api_nat44_interface_add_del_output_feature_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat44_interface_add_del_output_feature_reply_t *rmp;
+  u32 sw_if_index = ntohl (mp->sw_if_index);
+  int rv = 0;
+
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv = snat_interface_add_del_output_feature (sw_if_index,
+                                             mp->flags & NAT_API_IS_INSIDE,
+                                             !mp->is_add);
+
+  BAD_SW_IF_INDEX_LABEL;
+send_reply:
+  REPLY_MACRO (VL_API_NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE_REPLY);
+}
+
+static void *vl_api_nat44_interface_add_del_output_feature_t_print
+  (vl_api_nat44_interface_add_del_output_feature_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_interface_add_del_output_feature ");
+  s = format (s, "sw_if_index %d %s %s",
+             clib_host_to_net_u32 (mp->sw_if_index),
+             mp->flags & NAT_API_IS_INSIDE ? "in" : "out",
+             mp->is_add ? "" : "del");
+
+  FINISH;
+}
+
+static void
+send_nat44_interface_output_feature_details (snat_interface_t * i,
+                                            vl_api_registration_t * reg,
+                                            u32 context)
+{
+  vl_api_nat44_interface_output_feature_details_t *rmp;
+  snat_main_t *sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id =
+    ntohs (VL_API_NAT44_INTERFACE_OUTPUT_FEATURE_DETAILS + sm->msg_id_base);
+  rmp->sw_if_index = ntohl (i->sw_if_index);
+  rmp->context = context;
+
+  if (nat_interface_is_inside (i))
+    rmp->flags |= NAT_API_IS_INSIDE;
+
+  vl_api_send_msg (reg, (u8 *) rmp);
+}
+
+static void
+  vl_api_nat44_interface_output_feature_dump_t_handler
+  (vl_api_nat44_interface_output_feature_dump_t * mp)
+{
+  vl_api_registration_t *reg;
+  snat_main_t *sm = &snat_main;
+  snat_interface_t *i;
+
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  /* *INDENT-OFF* */
+  pool_foreach (i, sm->output_feature_interfaces,
+  ({
+    send_nat44_interface_output_feature_details(i, reg, mp->context);
+  }));
+  /* *INDENT-ON* */
+}
+
+static void *vl_api_nat44_interface_output_feature_dump_t_print
+  (vl_api_nat44_interface_output_feature_dump_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_interface_output_feature_dump ");
+
+  FINISH;
+}
+
+static void
+  vl_api_nat44_add_del_static_mapping_t_handler
+  (vl_api_nat44_add_del_static_mapping_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat44_add_del_static_mapping_reply_t *rmp;
+  ip4_address_t local_addr, external_addr;
+  u16 local_port = 0, external_port = 0;
+  u32 vrf_id, external_sw_if_index;
+  twice_nat_type_t twice_nat = TWICE_NAT_DISABLED;
+  int rv = 0;
+  snat_protocol_t proto;
+  u8 *tag = 0;
+  u32 len = 0;
+
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  memcpy (&local_addr.as_u8, mp->local_ip_address, 4);
+  memcpy (&external_addr.as_u8, mp->external_ip_address, 4);
+
+  if (!(mp->flags & NAT_API_IS_ADDR_ONLY))
+    {
       local_port = clib_net_to_host_u16 (mp->local_port);
       external_port = clib_net_to_host_u16 (mp->external_port);
     }
+
   vrf_id = clib_net_to_host_u32 (mp->vrf_id);
   external_sw_if_index = clib_net_to_host_u32 (mp->external_sw_if_index);
   proto = ip_proto_to_snat_proto (mp->protocol);
 
+  if (mp->flags & NAT_API_IS_TWICE_NAT)
+    twice_nat = TWICE_NAT;
+  else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT)
+    twice_nat = TWICE_NAT_SELF;
+
+  len = vl_api_string_len (&mp->tag);
+
+  tag = vec_new (u8, len);
+  memcpy (tag, mp->tag.buf, len);
+  vec_terminate_c_string (tag);
+
   rv = snat_add_static_mapping (local_addr, external_addr, local_port,
-                               external_port, vrf_id, mp->addr_only,
-                               external_sw_if_index, proto, mp->is_add,
-                               mp->twice_nat);
+                               external_port, vrf_id,
+                               mp->flags & NAT_API_IS_ADDR_ONLY,
+                               external_sw_if_index, proto,
+                               mp->is_add, twice_nat,
+                               mp->flags & NAT_API_IS_OUT2IN_ONLY, tag, 0);
+  vec_free (tag);
 
+send_reply:
   REPLY_MACRO (VL_API_NAT44_ADD_DEL_STATIC_MAPPING_REPLY);
 }
 
@@ -724,12 +1237,14 @@ static void *vl_api_nat44_add_del_static_mapping_t_print
              format_ip4_address, mp->local_ip_address,
              format_ip4_address, mp->external_ip_address);
 
-  if (mp->addr_only == 0)
+  if (!(mp->flags & NAT_API_IS_ADDR_ONLY))
     s = format (s, "local_port %d external_port %d ",
                clib_net_to_host_u16 (mp->local_port),
                clib_net_to_host_u16 (mp->external_port));
 
-  s = format (s, "twice_nat %d ", mp->twice_nat);
+  s = format (s, "twice_nat %d out2in_only %d ",
+             mp->flags & NAT_API_IS_TWICE_NAT,
+             mp->flags & NAT_API_IS_OUT2IN_ONLY);
 
   if (mp->vrf_id != ~0)
     s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id));
@@ -742,80 +1257,132 @@ static void *vl_api_nat44_add_del_static_mapping_t_print
 
 static void
 send_nat44_static_mapping_details (snat_static_mapping_t * m,
-                                  svm_queue_t * q, u32 context)
+                                  vl_api_registration_t * reg, u32 context)
 {
   vl_api_nat44_static_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  u32 len = sizeof (*rmp);
+
+  if (m->tag)
+    {
+      len += vec_len (m->tag);
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+      vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
+    }
+  else
+    {
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+    }
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_STATIC_MAPPING_DETAILS + sm->msg_id_base);
-  rmp->addr_only = m->addr_only;
+
   clib_memcpy (rmp->local_ip_address, &(m->local_addr), 4);
   clib_memcpy (rmp->external_ip_address, &(m->external_addr), 4);
-  rmp->local_port = htons (m->local_port);
-  rmp->external_port = htons (m->external_port);
   rmp->external_sw_if_index = ~0;
   rmp->vrf_id = htonl (m->vrf_id);
-  rmp->protocol = snat_proto_to_ip_proto (m->proto);
   rmp->context = context;
-  rmp->twice_nat = m->twice_nat;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  if (m->twice_nat == TWICE_NAT)
+    rmp->flags |= NAT_API_IS_TWICE_NAT;
+  else if (m->twice_nat == TWICE_NAT_SELF)
+    rmp->flags |= NAT_API_IS_SELF_TWICE_NAT;
+
+  if (is_out2in_only_static_mapping (m))
+    rmp->flags |= NAT_API_IS_OUT2IN_ONLY;
+
+  if (is_addr_only_static_mapping (m))
+    {
+      rmp->flags |= NAT_API_IS_ADDR_ONLY;
+    }
+  else
+    {
+      rmp->protocol = snat_proto_to_ip_proto (m->proto);
+      rmp->external_port = htons (m->external_port);
+      rmp->local_port = htons (m->local_port);
+    }
+
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 send_nat44_static_map_resolve_details (snat_static_map_resolve_t * m,
-                                      svm_queue_t * q, u32 context)
+                                      vl_api_registration_t * reg,
+                                      u32 context)
 {
   vl_api_nat44_static_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  u32 len = sizeof (*rmp);
+
+  if (m->tag)
+    {
+      len += vec_len (m->tag);
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+      vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
+    }
+  else
+    {
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+    }
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_STATIC_MAPPING_DETAILS + sm->msg_id_base);
-  rmp->addr_only = m->addr_only;
   clib_memcpy (rmp->local_ip_address, &(m->l_addr), 4);
-  rmp->local_port = htons (m->l_port);
-  rmp->external_port = htons (m->e_port);
   rmp->external_sw_if_index = htonl (m->sw_if_index);
   rmp->vrf_id = htonl (m->vrf_id);
-  rmp->protocol = snat_proto_to_ip_proto (m->proto);
   rmp->context = context;
-  rmp->twice_nat = m->twice_nat;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  if (m->twice_nat)
+    rmp->flags |= NAT_API_IS_TWICE_NAT;
+
+  if (m->addr_only)
+    {
+      rmp->flags |= NAT_API_IS_ADDR_ONLY;
+    }
+  else
+    {
+      rmp->protocol = snat_proto_to_ip_proto (m->proto);
+      rmp->external_port = htons (m->e_port);
+      rmp->local_port = htons (m->l_port);
+    }
+
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat44_static_mapping_dump_t_handler (vl_api_nat44_static_mapping_dump_t
                                            * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
   snat_static_map_resolve_t *rp;
   int j;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   pool_foreach (m, sm->static_mappings,
   ({
-      if (!vec_len(m->locals) && (m->local_addr.as_u32 != m->external_addr.as_u32))
-        send_nat44_static_mapping_details (m, q, mp->context);
+      if (!is_identity_static_mapping(m) && !is_lb_static_mapping (m))
+        send_nat44_static_mapping_details (m, reg, mp->context);
   }));
   /* *INDENT-ON* */
 
   for (j = 0; j < vec_len (sm->to_resolve); j++)
     {
       rp = sm->to_resolve + j;
-      if (rp->l_addr.as_u32 != 0)
-       send_nat44_static_map_resolve_details (rp, q, mp->context);
+      if (!rp->identity_nat)
+       send_nat44_static_map_resolve_details (rp, reg, mp->context);
     }
 }
 
@@ -841,8 +1408,16 @@ static void
   u32 vrf_id, sw_if_index;
   int rv = 0;
   snat_protocol_t proto = ~0;
+  u8 *tag = 0;
+  u32 len = 0;
 
-  if (mp->addr_only == 0)
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  if (!(mp->flags & NAT_API_IS_ADDR_ONLY))
     {
       port = clib_net_to_host_u16 (mp->port);
       proto = ip_proto_to_snat_proto (mp->protocol);
@@ -854,11 +1429,19 @@ static void
   else
     memcpy (&addr.as_u8, mp->ip_address, 4);
 
+  len = vl_api_string_len (&mp->tag);
+
+  tag = vec_new (u8, len);
+  memcpy (tag, mp->tag.buf, len);
+  vec_terminate_c_string (tag);
 
   rv =
-    snat_add_static_mapping (addr, addr, port, port, vrf_id, mp->addr_only,
-                            sw_if_index, proto, mp->is_add, 0);
+    snat_add_static_mapping (addr, addr, port, port, vrf_id,
+                            mp->flags & NAT_API_IS_ADDR_ONLY, sw_if_index,
+                            proto, mp->is_add, 0, 0, tag, 1);
+  vec_free (tag);
 
+send_reply:
   REPLY_MACRO (VL_API_NAT44_ADD_DEL_IDENTITY_MAPPING_REPLY);
 }
 
@@ -873,87 +1456,127 @@ static void *vl_api_nat44_add_del_identity_mapping_t_print
   else
     s = format (s, "addr %U", format_ip4_address, mp->ip_address);
 
-  if (mp->addr_only == 0)
+  if (!(mp->flags & NAT_API_IS_ADDR_ONLY))
     s =
-      format (s, "protocol %d port %d", mp->protocol,
+      format (s, " protocol %d port %d", mp->protocol,
              clib_net_to_host_u16 (mp->port));
 
   if (mp->vrf_id != ~0)
-    s = format (s, "vrf %d", clib_net_to_host_u32 (mp->vrf_id));
+    s = format (s, " vrf %d", clib_net_to_host_u32 (mp->vrf_id));
 
   FINISH;
 }
 
 static void
-send_nat44_identity_mapping_details (snat_static_mapping_t * m,
-                                    svm_queue_t * q, u32 context)
+send_nat44_identity_mapping_details (snat_static_mapping_t * m, int index,
+                                    vl_api_registration_t * reg, u32 context)
 {
   vl_api_nat44_identity_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  nat44_lb_addr_port_t *local = pool_elt_at_index (m->locals, index);
+  u32 len = sizeof (*rmp);
+
+  if (m->tag)
+    {
+      len += vec_len (m->tag);
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+      vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
+    }
+  else
+    {
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+    }
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base);
-  rmp->addr_only = m->addr_only;
+
+  if (is_addr_only_static_mapping (m))
+    rmp->flags |= NAT_API_IS_ADDR_ONLY;
+
   clib_memcpy (rmp->ip_address, &(m->local_addr), 4);
   rmp->port = htons (m->local_port);
   rmp->sw_if_index = ~0;
-  rmp->vrf_id = htonl (m->vrf_id);
+  rmp->vrf_id = htonl (local->vrf_id);
   rmp->protocol = snat_proto_to_ip_proto (m->proto);
   rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 send_nat44_identity_map_resolve_details (snat_static_map_resolve_t * m,
-                                        svm_queue_t * q, u32 context)
+                                        vl_api_registration_t * reg,
+                                        u32 context)
 {
   vl_api_nat44_identity_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
+  u32 len = sizeof (*rmp);
+
+  if (m->tag)
+    {
+      len += vec_len (m->tag);
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+      vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, &rmp->tag);
+    }
+  else
+    {
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+    }
 
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_IDENTITY_MAPPING_DETAILS + sm->msg_id_base);
-  rmp->addr_only = m->addr_only;
+
+  if (m->addr_only)
+    rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_ADDR_ONLY;
+
   rmp->port = htons (m->l_port);
   rmp->sw_if_index = htonl (m->sw_if_index);
   rmp->vrf_id = htonl (m->vrf_id);
   rmp->protocol = snat_proto_to_ip_proto (m->proto);
   rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
   vl_api_nat44_identity_mapping_dump_t_handler
   (vl_api_nat44_identity_mapping_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
   snat_static_map_resolve_t *rp;
   int j;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   pool_foreach (m, sm->static_mappings,
   ({
-      if (!vec_len(m->locals) && (m->local_addr.as_u32 == m->external_addr.as_u32))
-        send_nat44_identity_mapping_details (m, q, mp->context);
+      if (is_identity_static_mapping(m) && !is_lb_static_mapping (m))
+        {
+          pool_foreach_index (j, m->locals,
+          ({
+            send_nat44_identity_mapping_details (m, j, reg, mp->context);
+          }));
+        }
   }));
   /* *INDENT-ON* */
 
   for (j = 0; j < vec_len (sm->to_resolve); j++)
     {
       rp = sm->to_resolve + j;
-      if (rp->l_addr.as_u32 == 0)
-       send_nat44_identity_map_resolve_details (rp, q, mp->context);
+      if (rp->identity_nat)
+       send_nat44_identity_map_resolve_details (rp, reg, mp->context);
     }
 }
 
@@ -973,16 +1596,25 @@ static void
 {
   snat_main_t *sm = &snat_main;
   vl_api_nat44_add_del_interface_addr_reply_t *rmp;
-  u8 is_del = mp->is_add == 0;
   u32 sw_if_index = ntohl (mp->sw_if_index);
   int rv = 0;
+  u8 is_del;
+
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  is_del = !mp->is_add;
 
   VALIDATE_SW_IF_INDEX (mp);
 
-  rv = snat_add_interface_address (sm, sw_if_index, is_del, mp->twice_nat);
+  rv = snat_add_interface_address (sm, sw_if_index, is_del,
+                                  mp->flags & NAT_API_IS_TWICE_NAT);
 
   BAD_SW_IF_INDEX_LABEL;
-
+send_reply:
   REPLY_MACRO (VL_API_NAT44_ADD_DEL_INTERFACE_ADDR_REPLY);
 }
 
@@ -994,46 +1626,52 @@ static void *vl_api_nat44_add_del_interface_addr_t_print
   s = format (0, "SCRIPT: nat44_add_del_interface_addr ");
   s = format (s, "sw_if_index %d twice_nat %d %s",
              clib_host_to_net_u32 (mp->sw_if_index),
-             mp->twice_nat, mp->is_add ? "" : "del");
+             mp->flags & NAT_API_IS_TWICE_NAT, mp->is_add ? "" : "del");
 
   FINISH;
 }
 
 static void
 send_nat44_interface_addr_details (u32 sw_if_index,
-                                  svm_queue_t * q, u32 context, u8 twice_nat)
+                                  vl_api_registration_t * reg, u32 context,
+                                  u8 twice_nat)
 {
   vl_api_nat44_interface_addr_details_t *rmp;
   snat_main_t *sm = &snat_main;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_INTERFACE_ADDR_DETAILS + sm->msg_id_base);
   rmp->sw_if_index = ntohl (sw_if_index);
-  rmp->twice_nat = twice_nat;
+
+  if (twice_nat)
+    rmp->flags = (vl_api_nat_config_flags_t) NAT_API_IS_TWICE_NAT;
   rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat44_interface_addr_dump_t_handler (vl_api_nat44_interface_addr_dump_t
                                            * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   u32 *i;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   vec_foreach (i, sm->auto_add_sw_if_indices)
-    send_nat44_interface_addr_details(*i, q, mp->context, 0);
+    send_nat44_interface_addr_details(*i, reg, mp->context, 0);
   vec_foreach (i, sm->auto_add_sw_if_indices_twice_nat)
-    send_nat44_interface_addr_details(*i, q, mp->context, 1);
+    send_nat44_interface_addr_details(*i, reg, mp->context, 1);
   /* *INDENT-ON* */
 }
 
@@ -1049,42 +1687,54 @@ vl_api_nat44_interface_addr_dump_t_print (vl_api_nat44_interface_addr_dump_t *
 }
 
 static void
-send_nat44_user_details (snat_user_t * u, svm_queue_t * q, u32 context)
+send_nat44_user_details (snat_user_t * u, vl_api_registration_t * reg,
+                        u32 context)
 {
   vl_api_nat44_user_details_t *rmp;
   snat_main_t *sm = &snat_main;
-  fib_table_t *fib = fib_table_get (u->fib_index, FIB_PROTOCOL_IP4);
+  ip4_main_t *im = &ip4_main;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT44_USER_DETAILS + sm->msg_id_base);
 
-  rmp->vrf_id = ntohl (fib->ft_table_id);
+  if (!pool_is_free_index (im->fibs, u->fib_index))
+    {
+      fib_table_t *fib = fib_table_get (u->fib_index, FIB_PROTOCOL_IP4);
+      rmp->vrf_id = ntohl (fib->ft_table_id);
+    }
 
   clib_memcpy (rmp->ip_address, &(u->addr), 4);
   rmp->nsessions = ntohl (u->nsessions);
   rmp->nstaticsessions = ntohl (u->nstaticsessions);
   rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat44_user_dump_t_handler (vl_api_nat44_user_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   snat_main_per_thread_data_t *tsm;
   snat_user_t *u;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   vec_foreach (tsm, sm->per_thread_data)
-    vec_foreach (u, tsm->users)
-      send_nat44_user_details (u, q, mp->context);
+    {
+      pool_foreach (u, tsm->users,
+      ({
+        send_nat44_user_details (u, reg, mp->context);
+      }));
+    }
   /* *INDENT-ON* */
 }
 
@@ -1100,18 +1750,27 @@ vl_api_nat44_user_dump_t_print (vl_api_nat44_user_dump_t * mp, void *handle)
 
 static void
 send_nat44_user_session_details (snat_session_t * s,
-                                svm_queue_t * q, u32 context)
+                                vl_api_registration_t * reg, u32 context)
 {
   vl_api_nat44_user_session_details_t *rmp;
   snat_main_t *sm = &snat_main;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_USER_SESSION_DETAILS + sm->msg_id_base);
   clib_memcpy (rmp->outside_ip_address, (&s->out2in.addr), 4);
   clib_memcpy (rmp->inside_ip_address, (&s->in2out.addr), 4);
-  rmp->is_static = s->flags & SNAT_SESSION_FLAG_STATIC_MAPPING ? 1 : 0;
+
+  if (snat_is_session_static (s))
+    rmp->flags |= NAT_API_IS_STATIC;
+
+  if (is_twice_nat_session (s))
+    rmp->flags |= NAT_API_IS_TWICE_NAT;
+
+  if (is_ed_session (s) || is_fwd_bypass_session (s))
+    rmp->flags |= NAT_API_IS_EXT_HOST_VALID;
+
   rmp->last_heard = clib_host_to_net_u64 ((u64) s->last_heard);
   rmp->total_bytes = clib_host_to_net_u64 (s->total_bytes);
   rmp->total_pkts = ntohl (s->total_pkts);
@@ -1128,15 +1787,25 @@ send_nat44_user_session_details (snat_session_t * s,
       rmp->inside_port = s->in2out.port;
       rmp->protocol = ntohs (snat_proto_to_ip_proto (s->in2out.protocol));
     }
+  if (is_ed_session (s) || is_fwd_bypass_session (s))
+    {
+      clib_memcpy (rmp->ext_host_address, &s->ext_host_addr, 4);
+      rmp->ext_host_port = s->ext_host_port;
+      if (is_twice_nat_session (s))
+       {
+         clib_memcpy (rmp->ext_host_nat_address, &s->ext_host_nat_addr, 4);
+         rmp->ext_host_nat_port = s->ext_host_nat_port;
+       }
+    }
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t *
                                          mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   snat_main_per_thread_data_t *tsm;
   snat_session_t *s;
@@ -1147,15 +1816,18 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t *
   dlist_elt_t *head, *elt;
   ip4_header_t ip;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   clib_memcpy (&ukey.addr, mp->ip_address, 4);
   ip.src_address.as_u32 = ukey.addr.as_u32;
   ukey.fib_index = fib_table_find (FIB_PROTOCOL_IP4, ntohl (mp->vrf_id));
   key.key = ukey.as_u64;
-  if (sm->num_workers)
+  if (sm->num_workers > 1)
     tsm =
       vec_elt_at_index (sm->per_thread_data,
                        sm->worker_in2out_cb (&ip, ukey.fib_index));
@@ -1176,7 +1848,7 @@ vl_api_nat44_user_session_dump_t_handler (vl_api_nat44_user_session_dump_t *
     {
       s = pool_elt_at_index (tsm->sessions, session_index);
 
-      send_nat44_user_session_details (s, q, mp->context);
+      send_nat44_user_session_details (s, reg, mp->context);
 
       elt_index = elt->next;
       elt = pool_elt_at_index (tsm->list_pool, elt_index);
@@ -1200,7 +1872,7 @@ vl_api_nat44_user_session_dump_t_print (vl_api_nat44_user_session_dump_t * mp,
 
 static nat44_lb_addr_port_t *
 unformat_nat44_lb_addr_port (vl_api_nat44_lb_addr_port_t * addr_port_pairs,
-                            u8 addr_port_pair_num)
+                            u32 addr_port_pair_num)
 {
   u8 i;
   nat44_lb_addr_port_t *lb_addr_port_pairs = 0, lb_addr_port;
@@ -1209,10 +1881,11 @@ unformat_nat44_lb_addr_port (vl_api_nat44_lb_addr_port_t * addr_port_pairs,
   for (i = 0; i < addr_port_pair_num; i++)
     {
       ap = &addr_port_pairs[i];
-      memset (&lb_addr_port, 0, sizeof (lb_addr_port));
+      clib_memset (&lb_addr_port, 0, sizeof (lb_addr_port));
       clib_memcpy (&lb_addr_port.addr, ap->addr, 4);
       lb_addr_port.port = clib_net_to_host_u16 (ap->port);
       lb_addr_port.probability = ap->probability;
+      lb_addr_port.vrf_id = clib_net_to_host_u32 (ap->vrf_id);
       vec_add1 (lb_addr_port_pairs, lb_addr_port);
     }
 
@@ -1225,23 +1898,54 @@ static void
 {
   snat_main_t *sm = &snat_main;
   vl_api_nat44_add_del_lb_static_mapping_reply_t *rmp;
+  twice_nat_type_t twice_nat = TWICE_NAT_DISABLED;
   int rv = 0;
   nat44_lb_addr_port_t *locals = 0;
   ip4_address_t e_addr;
   snat_protocol_t proto;
+  vl_api_string_t *sp;
+  u8 *tag = 0;
+  u32 len = 0;
+
+  if (!sm->endpoint_dependent)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
 
-  locals = unformat_nat44_lb_addr_port (mp->locals, mp->local_num);
+  locals =
+    unformat_nat44_lb_addr_port (mp->locals,
+                                clib_net_to_host_u32 (mp->local_num));
   clib_memcpy (&e_addr, mp->external_addr, 4);
   proto = ip_proto_to_snat_proto (mp->protocol);
 
+  if (mp->flags & NAT_API_IS_TWICE_NAT)
+    twice_nat = TWICE_NAT;
+  else if (mp->flags & NAT_API_IS_SELF_TWICE_NAT)
+    twice_nat = TWICE_NAT_SELF;
+
+  sp = (void *) &mp->locals +
+    sizeof (vl_api_nat44_lb_addr_port_t) *
+    clib_net_to_host_u32 (mp->local_num);
+
+  len = vl_api_string_len (sp);
+
+  tag = vec_new (u8, len);
+  memcpy (tag, sp->buf, len);
+  vec_terminate_c_string (tag);
+
   rv =
     nat44_add_del_lb_static_mapping (e_addr,
                                     clib_net_to_host_u16 (mp->external_port),
-                                    proto, clib_net_to_host_u32 (mp->vrf_id),
-                                    locals, mp->is_add, mp->twice_nat);
+                                    proto, locals, mp->is_add,
+                                    twice_nat,
+                                    mp->flags & NAT_API_IS_OUT2IN_ONLY, tag,
+                                    clib_net_to_host_u32 (mp->affinity));
 
   vec_free (locals);
+  vec_free (tag);
 
+send_reply:
   REPLY_MACRO (VL_API_NAT44_ADD_DEL_LB_STATIC_MAPPING_REPLY);
 }
 
@@ -1251,64 +1955,143 @@ static void *vl_api_nat44_add_del_lb_static_mapping_t_print
   u8 *s;
 
   s = format (0, "SCRIPT: nat44_add_del_lb_static_mapping ");
-  s = format (s, "is_add %d twice_nat %d", mp->is_add, mp->twice_nat);
+  s = format (s, "is_add %d twice_nat %d out2in_only %d ",
+             mp->is_add,
+             mp->flags & NAT_API_IS_TWICE_NAT,
+             mp->flags & NAT_API_IS_OUT2IN_ONLY);
+
+  FINISH;
+}
+
+static void
+  vl_api_nat44_lb_static_mapping_add_del_local_t_handler
+  (vl_api_nat44_lb_static_mapping_add_del_local_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat44_lb_static_mapping_add_del_local_reply_t *rmp;
+  int rv = 0;
+  ip4_address_t e_addr, l_addr;
+  snat_protocol_t proto;
+
+  if (!sm->endpoint_dependent)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
+  clib_memcpy (&e_addr, mp->external_addr, 4);
+  clib_memcpy (&l_addr, mp->local.addr, 4);
+  proto = ip_proto_to_snat_proto (mp->protocol);
+
+  rv =
+    nat44_lb_static_mapping_add_del_local (e_addr,
+                                          clib_net_to_host_u16
+                                          (mp->external_port), l_addr,
+                                          clib_net_to_host_u16 (mp->
+                                                                local.port),
+                                          proto,
+                                          clib_net_to_host_u32 (mp->
+                                                                local.vrf_id),
+                                          mp->local.probability, mp->is_add);
+
+send_reply:
+  REPLY_MACRO (VL_API_NAT44_LB_STATIC_MAPPING_ADD_DEL_LOCAL_REPLY);
+}
+
+static void *vl_api_nat44_lb_static_mapping_add_del_local_t_print
+  (vl_api_nat44_lb_static_mapping_add_del_local_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat44_lb_static_mapping_add_del_local ");
+  s = format (s, "is_add %d", mp->is_add);
 
   FINISH;
 }
 
 static void
 send_nat44_lb_static_mapping_details (snat_static_mapping_t * m,
-                                     svm_queue_t * q, u32 context)
+                                     vl_api_registration_t * reg,
+                                     u32 context)
 {
   vl_api_nat44_lb_static_mapping_details_t *rmp;
   snat_main_t *sm = &snat_main;
   nat44_lb_addr_port_t *ap;
   vl_api_nat44_lb_addr_port_t *locals;
+  vl_api_string_t *sp;
+  u32 local_num = 0;
+  u32 len = sizeof (*rmp);
+
+  if (m->tag)
+    {
+      len += pool_elts (m->locals) *
+       sizeof (nat44_lb_addr_port_t) + vec_len (m->tag);
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+
+      sp = (void *) &m->locals +
+       sizeof (vl_api_nat44_lb_addr_port_t) * pool_elts (m->locals);
+      vl_api_to_api_string (vec_len (m->tag), (char *) m->tag, sp);
+    }
+  else
+    {
+      len += pool_elts (m->locals) * sizeof (nat44_lb_addr_port_t);
+      rmp = vl_msg_api_alloc (len);
+      clib_memset (rmp, 0, len);
+    }
 
-  rmp =
-    vl_msg_api_alloc (sizeof (*rmp) +
-                     (vec_len (m->locals) * sizeof (nat44_lb_addr_port_t)));
-  memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_LB_STATIC_MAPPING_DETAILS + sm->msg_id_base);
 
   clib_memcpy (rmp->external_addr, &(m->external_addr), 4);
   rmp->external_port = ntohs (m->external_port);
   rmp->protocol = snat_proto_to_ip_proto (m->proto);
-  rmp->vrf_id = ntohl (m->vrf_id);
   rmp->context = context;
-  rmp->twice_nat = m->twice_nat;
+
+  if (m->twice_nat == TWICE_NAT)
+    rmp->flags |= NAT_API_IS_TWICE_NAT;
+  else if (m->twice_nat == TWICE_NAT_SELF)
+    rmp->flags |= NAT_API_IS_SELF_TWICE_NAT;
+  if (is_out2in_only_static_mapping (m))
+    rmp->flags |= NAT_API_IS_OUT2IN_ONLY;
 
   locals = (vl_api_nat44_lb_addr_port_t *) rmp->locals;
-  vec_foreach (ap, m->locals)
-  {
+  /* *INDENT-OFF* */
+  pool_foreach (ap, m->locals,
+  ({
     clib_memcpy (locals->addr, &(ap->addr), 4);
     locals->port = htons (ap->port);
     locals->probability = ap->probability;
+    locals->vrf_id = ntohl (ap->vrf_id);
     locals++;
-    rmp->local_num++;
-  }
+    local_num++;
+  }));
+  /* *INDENT-ON* */
+  rmp->local_num = ntohl (local_num);
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
   vl_api_nat44_lb_static_mapping_dump_t_handler
   (vl_api_nat44_lb_static_mapping_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   snat_static_mapping_t *m;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (!sm->endpoint_dependent)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   pool_foreach (m, sm->static_mappings,
   ({
-      if (vec_len(m->locals))
-        send_nat44_lb_static_mapping_details (m, q, mp->context);
+      if (is_lb_static_mapping(m))
+        send_nat44_lb_static_mapping_details (m, reg, mp->context);
   }));
   /* *INDENT-ON* */
 }
@@ -1328,19 +2111,36 @@ vl_api_nat44_del_session_t_handler (vl_api_nat44_del_session_t * mp)
 {
   snat_main_t *sm = &snat_main;
   vl_api_nat44_del_session_reply_t *rmp;
-  ip4_address_t addr;
-  u16 port;
+  ip4_address_t addr, eh_addr;
+  u16 port, eh_port;
   u32 vrf_id;
   int rv = 0;
+  u8 is_in;
   snat_protocol_t proto;
 
+  if (sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
   memcpy (&addr.as_u8, mp->address, 4);
   port = clib_net_to_host_u16 (mp->port);
   vrf_id = clib_net_to_host_u32 (mp->vrf_id);
   proto = ip_proto_to_snat_proto (mp->protocol);
+  memcpy (&eh_addr.as_u8, mp->ext_host_address, 4);
+  eh_port = clib_net_to_host_u16 (mp->ext_host_port);
+
+  is_in = mp->flags & NAT_API_IS_INSIDE;
 
-  rv = nat44_del_session (sm, &addr, port, proto, vrf_id, mp->is_in);
+  if (mp->flags & NAT_API_IS_EXT_HOST_VALID)
+    rv =
+      nat44_del_ed_session (sm, &addr, port, &eh_addr, eh_port, mp->protocol,
+                           vrf_id, is_in);
+  else
+    rv = nat44_del_session (sm, &addr, port, proto, vrf_id, is_in);
 
+send_reply:
   REPLY_MACRO (VL_API_NAT44_DEL_SESSION_REPLY);
 }
 
@@ -1354,7 +2154,12 @@ vl_api_nat44_del_session_t_print (vl_api_nat44_del_session_t * mp,
   s = format (s, "addr %U port %d protocol %d vrf_id %d is_in %d",
              format_ip4_address, mp->address,
              clib_net_to_host_u16 (mp->port),
-             mp->protocol, clib_net_to_host_u32 (mp->vrf_id), mp->is_in);
+             mp->protocol, clib_net_to_host_u32 (mp->vrf_id),
+             mp->flags & NAT_API_IS_INSIDE);
+  if (mp->flags & NAT_API_IS_EXT_HOST_VALID)
+    s = format (s, "ext_host_address %U ext_host_port %d",
+               format_ip4_address, mp->ext_host_address,
+               clib_net_to_host_u16 (mp->ext_host_port));
 
   FINISH;
 }
@@ -1366,9 +2171,35 @@ static void
   snat_main_t *sm = &snat_main;
   vl_api_nat44_forwarding_enable_disable_reply_t *rmp;
   int rv = 0;
+  u32 *ses_to_be_removed = 0, *ses_index;
+  snat_main_per_thread_data_t *tsm;
+  snat_session_t *s;
 
   sm->forwarding_enabled = mp->enable != 0;
 
+  if (mp->enable == 0)
+    {
+      /* *INDENT-OFF* */
+      vec_foreach (tsm, sm->per_thread_data)
+      {
+        pool_foreach (s, tsm->sessions,
+        ({
+          if (is_fwd_bypass_session(s))
+            {
+              vec_add1 (ses_to_be_removed, s - tsm->sessions);
+            }
+        }));
+        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_delete_session (sm, s, tsm - sm->per_thread_data);
+        }
+        vec_free (ses_to_be_removed);
+      }
+      /* *INDENT-ON* */
+    }
+
   REPLY_MACRO (VL_API_NAT44_FORWARDING_ENABLE_DISABLE_REPLY);
 }
 
@@ -1387,23 +2218,23 @@ static void
   vl_api_nat44_forwarding_is_enabled_t_handler
   (vl_api_nat44_forwarding_is_enabled_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   vl_api_nat44_forwarding_is_enabled_reply_t *rmp;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id =
     ntohs (VL_API_NAT44_FORWARDING_IS_ENABLED_REPLY + sm->msg_id_base);
   rmp->context = mp->context;
 
   rmp->enabled = sm->forwarding_enabled;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void *vl_api_nat44_forwarding_is_enabled_t_print
@@ -1428,9 +2259,9 @@ vl_api_nat_det_add_del_map_t_handler (vl_api_nat_det_add_del_map_t * mp)
   int rv = 0;
   ip4_address_t in_addr, out_addr;
 
-  if (!mp->is_nat44)
+  if (!sm->deterministic)
     {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      rv = VNET_API_ERROR_UNSUPPORTED;
       goto send_reply;
     }
 
@@ -1467,11 +2298,11 @@ vl_api_nat_det_forward_t_handler (vl_api_nat_det_forward_t * mp)
   snat_det_map_t *dm;
   ip4_address_t in_addr, out_addr;
 
-  if (!mp->is_nat44)
+  if (!sm->deterministic)
     {
-      out_addr.as_u32 = 0;
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
-      goto send_reply;
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      REPLY_MACRO (VL_API_NAT_DET_FORWARD_REPLY);
+      return;
     }
 
   out_addr.as_u32 = 0;
@@ -1517,6 +2348,13 @@ vl_api_nat_det_reverse_t_handler (vl_api_nat_det_reverse_t * mp)
   ip4_address_t out_addr, in_addr;
   snat_det_map_t *dm;
 
+  if (!sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      REPLY_MACRO (VL_API_NAT_DET_REVERSE_REPLY);
+      return;
+    }
+
   in_addr.as_u32 = 0;
   clib_memcpy (&out_addr, mp->out_addr, 4);
   dm = snat_det_map_by_out (sm, &out_addr);
@@ -1532,8 +2370,6 @@ send_reply:
   /* *INDENT-OFF* */
   REPLY_MACRO2 (VL_API_NAT_DET_REVERSE_REPLY,
   ({
-    rmp->is_nat44 = 1;
-    memset (rmp->in_addr, 0, 16);
     clib_memcpy (rmp->in_addr, &in_addr, 4);
   }))
   /* *INDENT-ON* */
@@ -1552,15 +2388,15 @@ vl_api_nat_det_reverse_t_print (vl_api_nat_det_reverse_t * mp, void *handle)
 }
 
 static void
-sent_nat_det_map_details (snat_det_map_t * m, svm_queue_t * q, u32 context)
+sent_nat_det_map_details (snat_det_map_t * m, vl_api_registration_t * reg,
+                         u32 context)
 {
   vl_api_nat_det_map_details_t *rmp;
   snat_main_t *sm = &snat_main;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT_DET_MAP_DETAILS + sm->msg_id_base);
-  rmp->is_nat44 = 1;
   clib_memcpy (rmp->in_addr, &m->in_addr, 4);
   rmp->in_plen = m->in_plen;
   clib_memcpy (rmp->out_addr, &m->out_addr, 4);
@@ -1570,23 +2406,26 @@ sent_nat_det_map_details (snat_det_map_t * m, svm_queue_t * q, u32 context)
   rmp->ses_num = htonl (m->ses_num);
   rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat_det_map_dump_t_handler (vl_api_nat_det_map_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   snat_det_map_t *m;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (!sm->deterministic)
+    return;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   /* *INDENT-OFF* */
   vec_foreach(m, sm->det_maps)
-    sent_nat_det_map_details(m, q, mp->context);
+    sent_nat_det_map_details(m, reg, mp->context);
   /* *INDENT-ON* */
 }
 
@@ -1600,65 +2439,6 @@ vl_api_nat_det_map_dump_t_print (vl_api_nat_det_map_dump_t * mp, void *handle)
   FINISH;
 }
 
-static void
-vl_api_nat_det_set_timeouts_t_handler (vl_api_nat_det_set_timeouts_t * mp)
-{
-  snat_main_t *sm = &snat_main;
-  vl_api_nat_det_set_timeouts_reply_t *rmp;
-  int rv = 0;
-
-  sm->udp_timeout = ntohl (mp->udp);
-  sm->tcp_established_timeout = ntohl (mp->tcp_established);
-  sm->tcp_transitory_timeout = ntohl (mp->tcp_transitory);
-  sm->icmp_timeout = ntohl (mp->icmp);
-
-  REPLY_MACRO (VL_API_NAT_DET_SET_TIMEOUTS_REPLY);
-}
-
-static void *
-vl_api_nat_det_set_timeouts_t_print (vl_api_nat_det_set_timeouts_t * mp,
-                                    void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: nat_det_set_timeouts ");
-  s = format (s, "udp %d tcp_established %d tcp_transitory %d icmp %d\n",
-             ntohl (mp->udp),
-             ntohl (mp->tcp_established),
-             ntohl (mp->tcp_transitory), ntohl (mp->icmp));
-
-  FINISH;
-}
-
-static void
-vl_api_nat_det_get_timeouts_t_handler (vl_api_nat_det_get_timeouts_t * mp)
-{
-  snat_main_t *sm = &snat_main;
-  vl_api_nat_det_get_timeouts_reply_t *rmp;
-  int rv = 0;
-
-  /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_NAT_DET_GET_TIMEOUTS_REPLY,
-  ({
-    rmp->udp = htonl (sm->udp_timeout);
-    rmp->tcp_established = htonl (sm->tcp_established_timeout);
-    rmp->tcp_transitory = htonl (sm->tcp_transitory_timeout);
-    rmp->icmp = htonl (sm->icmp_timeout);
-  }))
-  /* *INDENT-ON* */
-}
-
-static void *
-vl_api_nat_det_get_timeouts_t_print (vl_api_nat_det_get_timeouts_t * mp,
-                                    void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: nat_det_get_timeouts");
-
-  FINISH;
-}
-
 static void
 vl_api_nat_det_close_session_out_t_handler (vl_api_nat_det_close_session_out_t
                                            * mp)
@@ -1671,6 +2451,12 @@ vl_api_nat_det_close_session_out_t_handler (vl_api_nat_det_close_session_out_t
   snat_det_session_t *ses;
   int rv = 0;
 
+  if (!sm->deterministic)
+    {
+      rv = VNET_API_ERROR_UNSUPPORTED;
+      goto send_reply;
+    }
+
   clib_memcpy (&out_addr, mp->out_addr, 4);
   clib_memcpy (&ext_addr, mp->ext_addr, 4);
 
@@ -1723,9 +2509,9 @@ vl_api_nat_det_close_session_in_t_handler (vl_api_nat_det_close_session_in_t *
   snat_det_session_t *ses;
   int rv = 0;
 
-  if (!mp->is_nat44)
+  if (!sm->deterministic)
     {
-      rv = VNET_API_ERROR_UNIMPLEMENTED;
+      rv = VNET_API_ERROR_UNSUPPORTED;
       goto send_reply;
     }
 
@@ -1767,13 +2553,13 @@ vl_api_nat_det_close_session_in_t_print (vl_api_nat_det_close_session_in_t *
 
 static void
 send_nat_det_session_details (snat_det_session_t * s,
-                             svm_queue_t * q, u32 context)
+                             vl_api_registration_t * reg, u32 context)
 {
   vl_api_nat_det_session_details_t *rmp;
   snat_main_t *sm = &snat_main;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT_DET_SESSION_DETAILS + sm->msg_id_base);
   rmp->in_port = s->in_port;
   clib_memcpy (rmp->ext_addr, &s->out.ext_host_addr, 4);
@@ -1783,26 +2569,27 @@ send_nat_det_session_details (snat_det_session_t * s,
   rmp->expire = ntohl (s->expire);
   rmp->context = context;
 
-  vl_msg_api_send_shmem (q, (u8 *) & rmp);
+  vl_api_send_msg (reg, (u8 *) rmp);
 }
 
 static void
 vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   snat_main_t *sm = &snat_main;
   ip4_address_t user_addr;
   snat_det_map_t *dm;
   snat_det_session_t *s, empty_ses;
   u16 i;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  if (!sm->deterministic)
     return;
-  if (!mp->is_nat44)
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
-  memset (&empty_ses, 0, sizeof (empty_ses));
+  clib_memset (&empty_ses, 0, sizeof (empty_ses));
   clib_memcpy (&user_addr, mp->user_addr, 4);
   dm = snat_det_map_by_user (sm, &user_addr);
   if (!dm)
@@ -1812,7 +2599,7 @@ vl_api_nat_det_session_dump_t_handler (vl_api_nat_det_session_dump_t * mp)
   for (i = 0; i < SNAT_DET_SES_PER_USER; i++)
     {
       if (s->out.as_u64)
-       send_nat_det_session_details (s, q, mp->context);
+       send_nat_det_session_details (s, reg, mp->context);
       s++;
     }
 }
@@ -1859,7 +2646,7 @@ static void
 
   for (i = 0; i < count; i++)
     {
-      if ((rv = nat64_add_del_pool_addr (&this_addr, vrf_id, mp->is_add)))
+      if ((rv = nat64_add_del_pool_addr (0, &this_addr, vrf_id, mp->is_add)))
        goto send_reply;
 
       increment_v4_address (&this_addr);
@@ -1885,7 +2672,7 @@ static void *vl_api_nat64_add_del_pool_addr_range_t_print
 
 typedef struct nat64_api_walk_ctx_t_
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   u32 context;
   nat64_db_t *db;
 } nat64_api_walk_ctx_t;
@@ -1898,7 +2685,7 @@ nat64_api_pool_walk (snat_address_t * a, void *arg)
   nat64_api_walk_ctx_t *ctx = arg;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT64_POOL_ADDR_DETAILS + sm->msg_id_base);
   clib_memcpy (rmp->address, &(a->addr), 4);
   if (a->fib_index != ~0)
@@ -1912,7 +2699,7 @@ nat64_api_pool_walk (snat_address_t * a, void *arg)
     rmp->vrf_id = ~0;
   rmp->context = ctx->context;
 
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
   return 0;
 }
@@ -1920,14 +2707,14 @@ nat64_api_pool_walk (snat_address_t * a, void *arg)
 static void
 vl_api_nat64_pool_addr_dump_t_handler (vl_api_nat64_pool_addr_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   nat64_api_walk_ctx_t ctx = {
-    .q = q,
+    .reg = reg,
     .context = mp->context,
   };
 
@@ -1956,8 +2743,8 @@ vl_api_nat64_add_del_interface_t_handler (vl_api_nat64_add_del_interface_t *
   VALIDATE_SW_IF_INDEX (mp);
 
   rv =
-    nat64_add_del_interface (ntohl (mp->sw_if_index), mp->is_inside,
-                            mp->is_add);
+    nat64_add_del_interface (ntohl (mp->sw_if_index),
+                            mp->flags & NAT_API_IS_INSIDE, mp->is_add);
 
   BAD_SW_IF_INDEX_LABEL;
 
@@ -1973,7 +2760,8 @@ vl_api_nat64_add_del_interface_t_print (vl_api_nat64_add_del_interface_t * mp,
   s = format (0, "SCRIPT: nat64_add_del_interface ");
   s = format (s, "sw_if_index %d %s %s",
              clib_host_to_net_u32 (mp->sw_if_index),
-             mp->is_inside ? "in" : "out", mp->is_add ? "" : "del");
+             mp->flags & NAT_API_IS_INSIDE ? "in" : "out",
+             mp->is_add ? "" : "del");
 
   FINISH;
 }
@@ -1986,15 +2774,18 @@ nat64_api_interface_walk (snat_interface_t * i, void *arg)
   nat64_api_walk_ctx_t *ctx = arg;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT64_INTERFACE_DETAILS + sm->msg_id_base);
   rmp->sw_if_index = ntohl (i->sw_if_index);
-  rmp->is_inside = (nat_interface_is_inside (i)
-                   && nat_interface_is_outside (i)) ? 2 :
-    nat_interface_is_inside (i);
+
+  if (nat_interface_is_inside (i))
+    rmp->flags |= NAT_API_IS_INSIDE;
+  if (nat_interface_is_outside (i))
+    rmp->flags |= NAT_API_IS_OUTSIDE;
+
   rmp->context = ctx->context;
 
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
   return 0;
 }
@@ -2002,14 +2793,14 @@ nat64_api_interface_walk (snat_interface_t * i, void *arg)
 static void
 vl_api_nat64_interface_dump_t_handler (vl_api_nat64_interface_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   nat64_api_walk_ctx_t ctx = {
-    .q = q,
+    .reg = reg,
     .context = mp->context,
   };
 
@@ -2072,124 +2863,60 @@ nat64_api_bib_walk (nat64_db_bib_entry_t * bibe, void *arg)
 {
   vl_api_nat64_bib_details_t *rmp;
   snat_main_t *sm = &snat_main;
-  nat64_api_walk_ctx_t *ctx = arg;
-  fib_table_t *fib;
-
-  fib = fib_table_get (bibe->fib_index, FIB_PROTOCOL_IP6);
-  if (!fib)
-    return -1;
-
-  rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
-  rmp->_vl_msg_id = ntohs (VL_API_NAT64_BIB_DETAILS + sm->msg_id_base);
-  rmp->context = ctx->context;
-  clib_memcpy (rmp->i_addr, &(bibe->in_addr), 16);
-  clib_memcpy (rmp->o_addr, &(bibe->out_addr), 4);
-  rmp->i_port = bibe->in_port;
-  rmp->o_port = bibe->out_port;
-  rmp->vrf_id = ntohl (fib->ft_table_id);
-  rmp->proto = bibe->proto;
-  rmp->is_static = bibe->is_static;
-  rmp->ses_num = ntohl (bibe->ses_num);
-
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
-
-  return 0;
-}
-
-static void
-vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp)
-{
-  svm_queue_t *q;
-  nat64_main_t *nm = &nat64_main;
-  nat64_db_t *db;
-
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
-    return;
-
-  nat64_api_walk_ctx_t ctx = {
-    .q = q,
-    .context = mp->context,
-  };
-
-  /* *INDENT-OFF* */
-  vec_foreach (db, nm->db)
-    nat64_db_bib_walk (db, mp->proto, nat64_api_bib_walk, &ctx);
-  /* *INDENT-ON* */
-}
-
-static void *
-vl_api_nat64_bib_dump_t_print (vl_api_nat64_bib_dump_t * mp, void *handle)
-{
-  u8 *s;
-
-  s = format (0, "SCRIPT: snat_bib_dump protocol %d", mp->proto);
-
-  FINISH;
-}
-
-static void
-vl_api_nat64_set_timeouts_t_handler (vl_api_nat64_set_timeouts_t * mp)
-{
-  snat_main_t *sm = &snat_main;
-  vl_api_nat64_set_timeouts_reply_t *rmp;
-  int rv = 0;
-
-  rv = nat64_set_icmp_timeout (ntohl (mp->icmp));
-  if (rv)
-    goto send_reply;
-  rv = nat64_set_udp_timeout (ntohl (mp->udp));
-  if (rv)
-    goto send_reply;
-  rv =
-    nat64_set_tcp_timeouts (ntohl (mp->tcp_trans), ntohl (mp->tcp_est),
-                           ntohl (mp->tcp_incoming_syn));
+  nat64_api_walk_ctx_t *ctx = arg;
+  fib_table_t *fib;
 
-send_reply:
-  REPLY_MACRO (VL_API_NAT64_SET_TIMEOUTS_REPLY);
-}
+  fib = fib_table_get (bibe->fib_index, FIB_PROTOCOL_IP6);
+  if (!fib)
+    return -1;
 
-static void *vl_api_nat64_set_timeouts_t_print
-  (vl_api_nat64_set_timeouts_t * mp, void *handle)
-{
-  u8 *s;
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_NAT64_BIB_DETAILS + sm->msg_id_base);
+  rmp->context = ctx->context;
+  clib_memcpy (rmp->i_addr, &(bibe->in_addr), 16);
+  clib_memcpy (rmp->o_addr, &(bibe->out_addr), 4);
+  rmp->i_port = bibe->in_port;
+  rmp->o_port = bibe->out_port;
+  rmp->vrf_id = ntohl (fib->ft_table_id);
+  rmp->proto = bibe->proto;
+  if (bibe->is_static)
+    rmp->flags |= NAT_API_IS_STATIC;
+  rmp->ses_num = ntohl (bibe->ses_num);
 
-  s = format (0, "SCRIPT: nat64_set_timeouts ");
-  s =
-    format (s,
-           "udp %d icmp %d, tcp_trans %d, tcp_est %d, tcp_incoming_syn %d\n",
-           ntohl (mp->udp), ntohl (mp->icmp), ntohl (mp->tcp_trans),
-           ntohl (mp->tcp_est), ntohl (mp->tcp_incoming_syn));
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
-  FINISH;
+  return 0;
 }
 
 static void
-vl_api_nat64_get_timeouts_t_handler (vl_api_nat64_get_timeouts_t * mp)
+vl_api_nat64_bib_dump_t_handler (vl_api_nat64_bib_dump_t * mp)
 {
-  snat_main_t *sm = &snat_main;
-  vl_api_nat64_get_timeouts_reply_t *rmp;
-  int rv = 0;
+  vl_api_registration_t *reg;
+  nat64_main_t *nm = &nat64_main;
+  nat64_db_t *db;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  nat64_api_walk_ctx_t ctx = {
+    .reg = reg,
+    .context = mp->context,
+  };
 
   /* *INDENT-OFF* */
-  REPLY_MACRO2 (VL_API_NAT64_GET_TIMEOUTS_REPLY,
-  ({
-    rmp->udp = htonl (nat64_get_udp_timeout());
-    rmp->icmp = htonl (nat64_get_icmp_timeout());
-    rmp->tcp_trans = htonl (nat64_get_tcp_trans_timeout());
-    rmp->tcp_est = htonl (nat64_get_tcp_est_timeout());
-    rmp->tcp_incoming_syn = htonl (nat64_get_tcp_incoming_syn_timeout());
-  }))
+  vec_foreach (db, nm->db)
+    nat64_db_bib_walk (db, mp->proto, nat64_api_bib_walk, &ctx);
   /* *INDENT-ON* */
 }
 
-static void *vl_api_nat64_get_timeouts_t_print
-  (vl_api_nat64_get_timeouts_t * mp, void *handle)
+static void *
+vl_api_nat64_bib_dump_t_print (vl_api_nat64_bib_dump_t * mp, void *handle)
 {
   u8 *s;
 
-  s = format (0, "SCRIPT: nat64_get_timeouts");
+  s = format (0, "SCRIPT: snat_bib_dump protocol %d", mp->proto);
 
   FINISH;
 }
@@ -2212,7 +2939,7 @@ nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg)
     return -1;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT64_ST_DETAILS + sm->msg_id_base);
   rmp->context = ctx->context;
   clib_memcpy (rmp->il_addr, &(bibe->in_addr), 16);
@@ -2225,7 +2952,7 @@ nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg)
   rmp->vrf_id = ntohl (fib->ft_table_id);
   rmp->proto = ste->proto;
 
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
   return 0;
 }
@@ -2233,16 +2960,16 @@ nat64_api_st_walk (nat64_db_st_entry_t * ste, void *arg)
 static void
 vl_api_nat64_st_dump_t_handler (vl_api_nat64_st_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
   nat64_main_t *nm = &nat64_main;
   nat64_db_t *db;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   nat64_api_walk_ctx_t ctx = {
-    .q = q,
+    .reg = reg,
     .context = mp->context,
   };
 
@@ -2273,10 +3000,10 @@ vl_api_nat64_add_del_prefix_t_handler (vl_api_nat64_add_del_prefix_t * mp)
   ip6_address_t prefix;
   int rv = 0;
 
-  memcpy (&prefix.as_u8, mp->prefix, 16);
+  memcpy (&prefix.as_u8, mp->prefix.prefix, 16);
 
   rv =
-    nat64_add_del_prefix (&prefix, mp->prefix_len,
+    nat64_add_del_prefix (&prefix, mp->prefix.len,
                          clib_net_to_host_u32 (mp->vrf_id), mp->is_add);
   REPLY_MACRO (VL_API_NAT64_ADD_DEL_PREFIX_REPLY);
 }
@@ -2288,7 +3015,7 @@ vl_api_nat64_add_del_prefix_t_print (vl_api_nat64_add_del_prefix_t * mp,
   u8 *s;
 
   s = format (0, "SCRIPT: nat64_add_del_prefix %U/%u vrf_id %u %s\n",
-             format_ip6_address, mp->prefix, mp->prefix_len,
+             format_ip6_address, mp->prefix.prefix, mp->prefix.len,
              ntohl (mp->vrf_id), mp->is_add ? "" : "del");
 
   FINISH;
@@ -2302,14 +3029,14 @@ nat64_api_prefix_walk (nat64_prefix_t * p, void *arg)
   nat64_api_walk_ctx_t *ctx = arg;
 
   rmp = vl_msg_api_alloc (sizeof (*rmp));
-  memset (rmp, 0, sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
   rmp->_vl_msg_id = ntohs (VL_API_NAT64_PREFIX_DETAILS + sm->msg_id_base);
-  clib_memcpy (rmp->prefix, &(p->prefix), 16);
-  rmp->prefix_len = p->plen;
+  clib_memcpy (rmp->prefix.prefix, &(p->prefix), 16);
+  rmp->prefix.len = p->plen;
   rmp->vrf_id = ntohl (p->vrf_id);
   rmp->context = ctx->context;
 
-  vl_msg_api_send_shmem (ctx->q, (u8 *) & rmp);
+  vl_api_send_msg (ctx->reg, (u8 *) rmp);
 
   return 0;
 }
@@ -2317,14 +3044,14 @@ nat64_api_prefix_walk (nat64_prefix_t * p, void *arg)
 static void
 vl_api_nat64_prefix_dump_t_handler (vl_api_nat64_prefix_dump_t * mp)
 {
-  svm_queue_t *q;
+  vl_api_registration_t *reg;
 
-  q = vl_api_client_index_to_input_queue (mp->client_index);
-  if (q == 0)
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
     return;
 
   nat64_api_walk_ctx_t ctx = {
-    .q = q,
+    .reg = reg,
     .context = mp->context,
   };
 
@@ -2385,10 +3112,14 @@ vl_api_dslite_set_aftr_addr_t_handler (vl_api_dslite_set_aftr_addr_t * mp)
   dslite_main_t *dm = &dslite_main;
   int rv = 0;
   ip6_address_t ip6_addr;
+  ip4_address_t ip4_addr;
 
   memcpy (&ip6_addr.as_u8, mp->ip6_addr, 16);
+  memcpy (&ip4_addr.as_u8, mp->ip4_addr, 4);
 
   rv = dslite_set_aftr_ip6_addr (dm, &ip6_addr);
+  if (rv == 0)
+    rv = dslite_set_aftr_ip4_addr (dm, &ip4_addr);
 
   REPLY_MACRO (VL_API_DSLITE_SET_AFTR_ADDR_REPLY);
 }
@@ -2407,6 +3138,96 @@ vl_api_dslite_set_aftr_addr_t_print (vl_api_dslite_set_aftr_addr_t * mp,
   FINISH;
 }
 
+static void
+vl_api_dslite_get_aftr_addr_t_handler (vl_api_dslite_get_aftr_addr_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_dslite_get_aftr_addr_reply_t *rmp;
+  dslite_main_t *dm = &dslite_main;
+  int rv = 0;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_DSLITE_GET_AFTR_ADDR_REPLY,
+  ({
+    memcpy (rmp->ip4_addr, &dm->aftr_ip4_addr.as_u8, 4);
+    memcpy (rmp->ip6_addr, &dm->aftr_ip6_addr.as_u8, 16);
+  }))
+  /* *INDENT-ON* */
+}
+
+static void *
+vl_api_dslite_get_aftr_addr_t_print (vl_api_dslite_get_aftr_addr_t * mp,
+                                    void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: dslite_get_aftr_addr");
+
+  FINISH;
+}
+
+static void
+vl_api_dslite_set_b4_addr_t_handler (vl_api_dslite_set_b4_addr_t * mp)
+{
+  vl_api_dslite_set_b4_addr_reply_t *rmp;
+  snat_main_t *sm = &snat_main;
+  dslite_main_t *dm = &dslite_main;
+  int rv = 0;
+  ip6_address_t ip6_addr;
+  ip4_address_t ip4_addr;
+
+  memcpy (&ip6_addr.as_u8, mp->ip6_addr, 16);
+  memcpy (&ip4_addr.as_u8, mp->ip4_addr, 4);
+
+  rv = dslite_set_b4_ip6_addr (dm, &ip6_addr);
+  if (rv == 0)
+    rv = dslite_set_b4_ip4_addr (dm, &ip4_addr);
+
+  REPLY_MACRO (VL_API_DSLITE_SET_B4_ADDR_REPLY);
+}
+
+static void *
+vl_api_dslite_set_b4_addr_t_print (vl_api_dslite_set_b4_addr_t * mp,
+                                  void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: dslite_set_b4_addr ");
+  s = format (s, "ip6_addr %U ip4_addr %U\n",
+             format_ip6_address, mp->ip6_addr,
+             format_ip6_address, mp->ip4_addr);
+
+  FINISH;
+}
+
+static void
+vl_api_dslite_get_b4_addr_t_handler (vl_api_dslite_get_b4_addr_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_dslite_get_b4_addr_reply_t *rmp;
+  dslite_main_t *dm = &dslite_main;
+  int rv = 0;
+
+  /* *INDENT-OFF* */
+  REPLY_MACRO2 (VL_API_DSLITE_GET_B4_ADDR_REPLY,
+  ({
+    memcpy (rmp->ip4_addr, &dm->b4_ip4_addr.as_u8, 4);
+    memcpy (rmp->ip6_addr, &dm->b4_ip6_addr.as_u8, 16);
+  }))
+  /* *INDENT-ON* */
+}
+
+static void *
+vl_api_dslite_get_b4_addr_t_print (vl_api_dslite_get_b4_addr_t * mp,
+                                  void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: dslite_get_b4_addr");
+
+  FINISH;
+}
+
 static void
   vl_api_dslite_add_del_pool_addr_range_t_handler
   (vl_api_dslite_add_del_pool_addr_range_t * mp)
@@ -2440,6 +3261,54 @@ send_reply:
   REPLY_MACRO (VL_API_DSLITE_ADD_DEL_POOL_ADDR_RANGE_REPLY);
 }
 
+static void
+send_dslite_address_details (snat_address_t * ap,
+                            vl_api_registration_t * reg, u32 context)
+{
+  vl_api_dslite_address_details_t *rmp;
+  snat_main_t *sm = &snat_main;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+
+  clib_memset (rmp, 0, sizeof (*rmp));
+
+  rmp->_vl_msg_id = ntohs (VL_API_DSLITE_ADDRESS_DETAILS + sm->msg_id_base);
+  clib_memcpy (rmp->ip_address, &(ap->addr), 4);
+  rmp->context = context;
+
+  vl_api_send_msg (reg, (u8 *) rmp);
+}
+
+static void
+vl_api_dslite_address_dump_t_handler (vl_api_dslite_address_dump_t * mp)
+{
+  vl_api_registration_t *reg;
+  dslite_main_t *dm = &dslite_main;
+  snat_address_t *ap;
+
+  reg = vl_api_client_index_to_registration (mp->client_index);
+  if (!reg)
+    return;
+
+  /* *INDENT-OFF* */
+  vec_foreach (ap, dm->addr_pool)
+    {
+      send_dslite_address_details (ap, reg, mp->context);
+    }
+  /* *INDENT-ON* */
+}
+
+static void *
+vl_api_dslite_address_dump_t_print (vl_api_dslite_address_dump_t * mp,
+                                   void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: dslite_address_dump ");
+
+  FINISH;
+}
+
 static void *vl_api_dslite_add_del_pool_addr_range_t_print
   (vl_api_dslite_add_del_pool_addr_range_t * mp, void *handle)
 {
@@ -2454,6 +3323,194 @@ static void *vl_api_dslite_add_del_pool_addr_range_t_print
 }
 
 
+/*************/
+/*** NAT66 ***/
+/*************/
+
+static void
+vl_api_nat66_add_del_interface_t_handler (vl_api_nat66_add_del_interface_t *
+                                         mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat66_add_del_interface_reply_t *rmp;
+  int rv = 0;
+
+  VALIDATE_SW_IF_INDEX (mp);
+
+  rv =
+    nat66_interface_add_del (ntohl (mp->sw_if_index),
+                            mp->flags & NAT_API_IS_INSIDE, mp->is_add);
+
+  BAD_SW_IF_INDEX_LABEL;
+
+  REPLY_MACRO (VL_API_NAT66_ADD_DEL_INTERFACE_REPLY);
+}
+
+static void *
+vl_api_nat66_add_del_interface_t_print (vl_api_nat66_add_del_interface_t * mp,
+                                       void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat66_add_del_interface ");
+  s = format (s, "sw_if_index %d %s %s",
+             clib_host_to_net_u32 (mp->sw_if_index),
+             mp->flags & NAT_API_IS_INSIDE ? "in" : "out",
+             mp->is_add ? "" : "del");
+
+  FINISH;
+}
+
+static void
+  vl_api_nat66_add_del_static_mapping_t_handler
+  (vl_api_nat66_add_del_static_mapping_t * mp)
+{
+  snat_main_t *sm = &snat_main;
+  vl_api_nat66_add_del_static_mapping_reply_t *rmp;
+  ip6_address_t l_addr, e_addr;
+  int rv = 0;
+
+  memcpy (&l_addr.as_u8, mp->local_ip_address, 16);
+  memcpy (&e_addr.as_u8, mp->external_ip_address, 16);
+
+  rv =
+    nat66_static_mapping_add_del (&l_addr, &e_addr,
+                                 clib_net_to_host_u32 (mp->vrf_id),
+                                 mp->is_add);
+
+  REPLY_MACRO (VL_API_NAT66_ADD_DEL_STATIC_MAPPING_REPLY);
+}
+
+static void *vl_api_nat66_add_del_static_mapping_t_print
+  (vl_api_nat66_add_del_static_mapping_t * mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat66_add_del_static_mapping ");
+  s = format (s, "local_ip_address %U external_ip_address %U vrf_id %d %s",
+             format_ip6_address, mp->local_ip_address,
+             format_ip6_address, mp->external_ip_address,
+             clib_net_to_host_u32 (mp->vrf_id), mp->is_add ? "" : "del");
+
+  FINISH;
+}
+
+typedef struct nat66_api_walk_ctx_t_
+{
+  vl_api_registration_t *rp;
+  u32 context;
+} nat66_api_walk_ctx_t;
+
+static int
+nat66_api_interface_walk (snat_interface_t * i, void *arg)
+{
+  vl_api_nat66_interface_details_t *rmp;
+  snat_main_t *sm = &snat_main;
+  nat66_api_walk_ctx_t *ctx = arg;
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id = ntohs (VL_API_NAT66_INTERFACE_DETAILS + sm->msg_id_base);
+  rmp->sw_if_index = ntohl (i->sw_if_index);
+  if (nat_interface_is_inside (i))
+    rmp->flags |= NAT_API_IS_INSIDE;
+  rmp->context = ctx->context;
+
+  vl_api_send_msg (ctx->rp, (u8 *) rmp);
+
+  return 0;
+}
+
+static void
+vl_api_nat66_interface_dump_t_handler (vl_api_nat66_interface_dump_t * mp)
+{
+  vl_api_registration_t *rp;
+
+  rp = vl_api_client_index_to_registration (mp->client_index);
+  if (rp == 0)
+    return;
+
+  nat66_api_walk_ctx_t ctx = {
+    .rp = rp,
+    .context = mp->context,
+  };
+
+  nat66_interfaces_walk (nat66_api_interface_walk, &ctx);
+}
+
+static void *
+vl_api_nat66_interface_dump_t_print (vl_api_nat66_interface_dump_t * mp,
+                                    void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat66_interface_dump ");
+
+  FINISH;
+}
+
+static int
+nat66_api_static_mapping_walk (nat66_static_mapping_t * m, void *arg)
+{
+  vl_api_nat66_static_mapping_details_t *rmp;
+  nat66_main_t *nm = &nat66_main;
+  snat_main_t *sm = &snat_main;
+  nat66_api_walk_ctx_t *ctx = arg;
+  fib_table_t *fib;
+  vlib_counter_t vc;
+
+  fib = fib_table_get (m->fib_index, FIB_PROTOCOL_IP6);
+  if (!fib)
+    return -1;
+
+  vlib_get_combined_counter (&nm->session_counters, m - nm->sm, &vc);
+
+  rmp = vl_msg_api_alloc (sizeof (*rmp));
+  clib_memset (rmp, 0, sizeof (*rmp));
+  rmp->_vl_msg_id =
+    ntohs (VL_API_NAT66_STATIC_MAPPING_DETAILS + sm->msg_id_base);
+  clib_memcpy (rmp->local_ip_address, &m->l_addr, 16);
+  clib_memcpy (rmp->external_ip_address, &m->e_addr, 16);
+  rmp->vrf_id = ntohl (fib->ft_table_id);
+  rmp->total_bytes = clib_host_to_net_u64 (vc.bytes);
+  rmp->total_pkts = clib_host_to_net_u64 (vc.packets);
+  rmp->context = ctx->context;
+
+  vl_api_send_msg (ctx->rp, (u8 *) rmp);
+
+  return 0;
+}
+
+static void
+vl_api_nat66_static_mapping_dump_t_handler (vl_api_nat66_static_mapping_dump_t
+                                           * mp)
+{
+  vl_api_registration_t *rp;
+
+  rp = vl_api_client_index_to_registration (mp->client_index);
+  if (rp == 0)
+    return;
+
+  nat66_api_walk_ctx_t ctx = {
+    .rp = rp,
+    .context = mp->context,
+  };
+
+  nat66_static_mappings_walk (nat66_api_static_mapping_walk, &ctx);
+}
+
+static void *
+vl_api_nat66_static_mapping_dump_t_print (vl_api_nat66_static_mapping_dump_t *
+                                         mp, void *handle)
+{
+  u8 *s;
+
+  s = format (0, "SCRIPT: nat66_static_mapping_dump ");
+
+  FINISH;
+}
+
+
 /* List of message types that this plugin understands */
 #define foreach_snat_plugin_api_msg                                     \
 _(NAT_CONTROL_PING, nat_control_ping)                                   \
@@ -2464,6 +3521,18 @@ _(NAT_IPFIX_ENABLE_DISABLE, nat_ipfix_enable_disable)                   \
 _(NAT_SET_REASS, nat_set_reass)                                         \
 _(NAT_GET_REASS, nat_get_reass)                                         \
 _(NAT_REASS_DUMP, nat_reass_dump)                                       \
+_(NAT_SET_TIMEOUTS, nat_set_timeouts)                                   \
+_(NAT_GET_TIMEOUTS, nat_get_timeouts)                                   \
+_(NAT_SET_ADDR_AND_PORT_ALLOC_ALG, nat_set_addr_and_port_alloc_alg)     \
+_(NAT_GET_ADDR_AND_PORT_ALLOC_ALG, nat_get_addr_and_port_alloc_alg)     \
+_(NAT_SET_MSS_CLAMPING, nat_set_mss_clamping)                           \
+_(NAT_GET_MSS_CLAMPING, nat_get_mss_clamping)                           \
+_(NAT_HA_SET_LISTENER, nat_ha_set_listener)                             \
+_(NAT_HA_SET_FAILOVER, nat_ha_set_failover)                             \
+_(NAT_HA_GET_LISTENER, nat_ha_get_listener)                             \
+_(NAT_HA_GET_FAILOVER, nat_ha_get_failover)                             \
+_(NAT_HA_FLUSH, nat_ha_flush)                                           \
+_(NAT_HA_RESYNC, nat_ha_resync)                                         \
 _(NAT44_ADD_DEL_ADDRESS_RANGE, nat44_add_del_address_range)             \
 _(NAT44_INTERFACE_ADD_DEL_FEATURE, nat44_interface_add_del_feature)     \
 _(NAT44_ADD_DEL_STATIC_MAPPING, nat44_add_del_static_mapping)           \
@@ -2481,6 +3550,8 @@ _(NAT44_INTERFACE_ADD_DEL_OUTPUT_FEATURE,                               \
 _(NAT44_INTERFACE_OUTPUT_FEATURE_DUMP,                                  \
   nat44_interface_output_feature_dump)                                  \
 _(NAT44_ADD_DEL_LB_STATIC_MAPPING, nat44_add_del_lb_static_mapping)     \
+_(NAT44_LB_STATIC_MAPPING_ADD_DEL_LOCAL,                                \
+  nat44_lb_static_mapping_add_del_local)                                \
 _(NAT44_LB_STATIC_MAPPING_DUMP, nat44_lb_static_mapping_dump)           \
 _(NAT44_DEL_SESSION, nat44_del_session)                                 \
 _(NAT44_FORWARDING_ENABLE_DISABLE, nat44_forwarding_enable_disable)     \
@@ -2489,8 +3560,6 @@ _(NAT_DET_ADD_DEL_MAP, nat_det_add_del_map)                             \
 _(NAT_DET_FORWARD, nat_det_forward)                                     \
 _(NAT_DET_REVERSE, nat_det_reverse)                                     \
 _(NAT_DET_MAP_DUMP, nat_det_map_dump)                                   \
-_(NAT_DET_SET_TIMEOUTS, nat_det_set_timeouts)                           \
-_(NAT_DET_GET_TIMEOUTS, nat_det_get_timeouts)                           \
 _(NAT_DET_CLOSE_SESSION_OUT, nat_det_close_session_out)                 \
 _(NAT_DET_CLOSE_SESSION_IN, nat_det_close_session_in)                   \
 _(NAT_DET_SESSION_DUMP, nat_det_session_dump)                           \
@@ -2500,14 +3569,20 @@ _(NAT64_ADD_DEL_INTERFACE, nat64_add_del_interface)                     \
 _(NAT64_INTERFACE_DUMP, nat64_interface_dump)                           \
 _(NAT64_ADD_DEL_STATIC_BIB, nat64_add_del_static_bib)                   \
 _(NAT64_BIB_DUMP, nat64_bib_dump)                                       \
-_(NAT64_SET_TIMEOUTS, nat64_set_timeouts)                               \
-_(NAT64_GET_TIMEOUTS, nat64_get_timeouts)                               \
 _(NAT64_ST_DUMP, nat64_st_dump)                                         \
 _(NAT64_ADD_DEL_PREFIX, nat64_add_del_prefix)                           \
 _(NAT64_PREFIX_DUMP, nat64_prefix_dump)                                 \
 _(NAT64_ADD_DEL_INTERFACE_ADDR, nat64_add_del_interface_addr)           \
 _(DSLITE_ADD_DEL_POOL_ADDR_RANGE, dslite_add_del_pool_addr_range)       \
-_(DSLITE_SET_AFTR_ADDR, dslite_set_aftr_addr)
+_(DSLITE_ADDRESS_DUMP, dslite_address_dump)                            \
+_(DSLITE_SET_AFTR_ADDR, dslite_set_aftr_addr)                           \
+_(DSLITE_GET_AFTR_ADDR, dslite_get_aftr_addr)                           \
+_(DSLITE_SET_B4_ADDR, dslite_set_b4_addr)                               \
+_(DSLITE_GET_B4_ADDR, dslite_get_b4_addr)                               \
+_(NAT66_ADD_DEL_INTERFACE, nat66_add_del_interface)                     \
+_(NAT66_INTERFACE_DUMP, nat66_interface_dump)                           \
+_(NAT66_ADD_DEL_STATIC_MAPPING, nat66_add_del_static_mapping)           \
+_(NAT66_STATIC_MAPPING_DUMP, nat66_static_mapping_dump)
 
 /* Set up the API message handling tables */
 static clib_error_t *