VPP-362 Implement dumping of LISP adjacencies
[vpp.git] / vnet / vnet / lisp-cp / control.c
index f60405e..8dc4207 100644 (file)
  * limitations under the License.
  */
 
+#include <vlibmemory/api.h>
 #include <vnet/lisp-cp/control.h>
 #include <vnet/lisp-cp/packets.h>
 #include <vnet/lisp-cp/lisp_msg_serdes.h>
 #include <vnet/lisp-gpe/lisp_gpe.h>
+#include <vnet/lisp-gpe/lisp_gpe_fwd_entry.h>
+#include <vnet/lisp-gpe/lisp_gpe_tenant.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/fib/fib_table.h>
+
+typedef struct
+{
+  u8 is_resend;
+  gid_address_t seid;
+  gid_address_t deid;
+  u8 smr_invoked;
+} map_request_args_t;
+
+u8
+vnet_lisp_get_map_request_mode (void)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lcm->map_request_mode;
+}
+
+static int
+queue_map_request (gid_address_t * seid, gid_address_t * deid,
+                  u8 smr_invoked, u8 is_resend);
+
+ip_interface_address_t *
+ip_interface_get_first_interface_address (ip_lookup_main_t * lm,
+                                         u32 sw_if_index, u8 loop)
+{
+  vnet_main_t *vnm = vnet_get_main ();
+  vnet_sw_interface_t *swif = vnet_get_sw_interface (vnm, sw_if_index);
+  if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
+    sw_if_index = swif->unnumbered_sw_if_index;
+  u32 ia =
+    (vec_len ((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ?
+    vec_elt ((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) :
+    (u32) ~ 0;
+  return pool_elt_at_index ((lm)->if_address_pool, ia);
+}
+
+void *
+ip_interface_get_first_address (ip_lookup_main_t * lm, u32 sw_if_index,
+                               u8 version)
+{
+  ip_interface_address_t *ia;
+
+  ia = ip_interface_get_first_interface_address (lm, sw_if_index, 1);
+  if (!ia)
+    return 0;
+  return ip_interface_address_get_address (lm, ia);
+}
+
+int
+ip_interface_get_first_ip_address (lisp_cp_main_t * lcm, u32 sw_if_index,
+                                  u8 version, ip_address_t * result)
+{
+  ip_lookup_main_t *lm;
+  void *addr;
+
+  lm = (version == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
+  addr = ip_interface_get_first_address (lm, sw_if_index, version);
+  if (!addr)
+    return 0;
+
+  ip_address_set (result, addr, version);
+  return 1;
+}
+
+/**
+ * convert from a LISP address to a FIB prefix
+ */
+void
+ip_address_to_fib_prefix (const ip_address_t * addr, fib_prefix_t * prefix)
+{
+  if (addr->version == IP4)
+    {
+      prefix->fp_len = 32;
+      prefix->fp_proto = FIB_PROTOCOL_IP4;
+      memset (&prefix->fp_addr.pad, 0, sizeof (prefix->fp_addr.pad));
+      memcpy (&prefix->fp_addr.ip4, &addr->ip, sizeof (prefix->fp_addr.ip4));
+    }
+  else
+    {
+      prefix->fp_len = 128;
+      prefix->fp_proto = FIB_PROTOCOL_IP6;
+      memcpy (&prefix->fp_addr.ip6, &addr->ip, sizeof (prefix->fp_addr.ip6));
+    }
+}
+
+/**
+ * convert from a LISP to a FIB prefix
+ */
+void
+ip_prefix_to_fib_prefix (const ip_prefix_t * ip_prefix,
+                        fib_prefix_t * fib_prefix)
+{
+  ip_address_to_fib_prefix (&ip_prefix->addr, fib_prefix);
+  fib_prefix->fp_len = ip_prefix->len;
+}
+
+/**
+ * Find the sw_if_index of the interface that would be used to egress towards
+ * dst.
+ */
+u32
+ip_fib_get_egress_iface_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst)
+{
+  fib_node_index_t fei;
+  fib_prefix_t prefix;
+
+  ip_address_to_fib_prefix (dst, &prefix);
+
+  fei = fib_table_lookup (0, &prefix);
+
+  return (fib_entry_get_resolving_interface (fei));
+}
+
+/**
+ * Find first IP of the interface that would be used to egress towards dst.
+ * Returns 1 if the address is found 0 otherwise.
+ */
+int
+ip_fib_get_first_egress_ip_for_dst (lisp_cp_main_t * lcm, ip_address_t * dst,
+                                   ip_address_t * result)
+{
+  u32 si;
+  ip_lookup_main_t *lm;
+  void *addr = 0;
+  u8 ipver;
+
+  ASSERT (result != 0);
+
+  ipver = ip_addr_version (dst);
+
+  lm = (ipver == IP4) ? &lcm->im4->lookup_main : &lcm->im6->lookup_main;
+  si = ip_fib_get_egress_iface_for_dst (lcm, dst);
+
+  if ((u32) ~ 0 == si)
+    return 0;
+
+  /* find the first ip address */
+  addr = ip_interface_get_first_address (lm, si, ipver);
+  if (0 == addr)
+    return 0;
+
+  ip_address_set (result, addr, ipver);
+  return 1;
+}
+
+static int
+dp_add_del_iface (lisp_cp_main_t * lcm, u32 vni, u8 is_l2, u8 is_add)
+{
+  uword *dp_table;
+
+  if (!is_l2)
+    {
+      dp_table = hash_get (lcm->table_id_by_vni, vni);
+
+      if (!dp_table)
+       {
+         clib_warning ("vni %d not associated to a vrf!", vni);
+         return VNET_API_ERROR_INVALID_VALUE;
+       }
+    }
+  else
+    {
+      dp_table = hash_get (lcm->bd_id_by_vni, vni);
+      if (!dp_table)
+       {
+         clib_warning ("vni %d not associated to a bridge domain!", vni);
+         return VNET_API_ERROR_INVALID_VALUE;
+       }
+    }
+
+  /* enable/disable data-plane interface */
+  if (is_add)
+    {
+      if (is_l2)
+       lisp_gpe_tenant_l2_iface_add_or_lock (vni, dp_table[0]);
+      else
+       lisp_gpe_tenant_l3_iface_add_or_lock (vni, dp_table[0]);
+    }
+  else
+    {
+      if (is_l2)
+       lisp_gpe_tenant_l2_iface_unlock (vni);
+      else
+       lisp_gpe_tenant_l3_iface_unlock (vni);
+    }
+
+  return 0;
+}
+
+static void
+dp_del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
+{
+  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+  fwd_entry_t *fe = 0;
+  uword *feip = 0;
+  memset (a, 0, sizeof (*a));
+
+  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
+  if (!feip)
+    return;
+
+  fe = pool_elt_at_index (lcm->fwd_entry_pool, feip[0]);
+
+  /* delete dp fwd entry */
+  u32 sw_if_index;
+  a->is_add = 0;
+  a->locator_pairs = fe->locator_pairs;
+  a->vni = gid_address_vni (&fe->reid);
+  gid_address_copy (&a->rmt_eid, &fe->reid);
+
+  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
+
+  /* delete entry in fwd table */
+  hash_unset (lcm->fwd_entry_by_mapping_index, dst_map_index);
+  vec_free (fe->locator_pairs);
+  pool_put (lcm->fwd_entry_pool, fe);
+}
+
+/**
+ * Finds first remote locator with best (lowest) priority that has a local
+ * peer locator with an underlying route to it.
+ *
+ */
+static u32
+get_locator_pairs (lisp_cp_main_t * lcm, mapping_t * lcl_map,
+                  mapping_t * rmt_map, locator_pair_t ** locator_pairs)
+{
+  u32 i, limitp = 0, li, found = 0, esi;
+  locator_set_t *rmt_ls, *lcl_ls;
+  ip_address_t _lcl_addr, *lcl_addr = &_lcl_addr;
+  locator_t *lp, *rmt = 0;
+  uword *checked = 0;
+  locator_pair_t pair;
+
+  rmt_ls =
+    pool_elt_at_index (lcm->locator_set_pool, rmt_map->locator_set_index);
+  lcl_ls =
+    pool_elt_at_index (lcm->locator_set_pool, lcl_map->locator_set_index);
+
+  if (!rmt_ls || vec_len (rmt_ls->locator_indices) == 0)
+    return 0;
+
+  while (1)
+    {
+      rmt = 0;
+
+      /* find unvisited remote locator with best priority */
+      for (i = 0; i < vec_len (rmt_ls->locator_indices); i++)
+       {
+         if (0 != hash_get (checked, i))
+           continue;
+
+         li = vec_elt (rmt_ls->locator_indices, i);
+         lp = pool_elt_at_index (lcm->locator_pool, li);
+
+         /* we don't support non-IP locators for now */
+         if (gid_address_type (&lp->address) != GID_ADDR_IP_PREFIX)
+           continue;
+
+         if ((found && lp->priority == limitp)
+             || (!found && lp->priority >= limitp))
+           {
+             rmt = lp;
+
+             /* don't search for locators with lower priority and don't
+              * check this locator again*/
+             limitp = lp->priority;
+             hash_set (checked, i, 1);
+             break;
+           }
+       }
+      /* check if a local locator with a route to remote locator exists */
+      if (rmt != 0)
+       {
+         /* find egress sw_if_index for rmt locator */
+         esi =
+           ip_fib_get_egress_iface_for_dst (lcm,
+                                            &gid_address_ip (&rmt->address));
+         if ((u32) ~ 0 == esi)
+           continue;
+
+         for (i = 0; i < vec_len (lcl_ls->locator_indices); i++)
+           {
+             li = vec_elt (lcl_ls->locator_indices, i);
+             locator_t *sl = pool_elt_at_index (lcm->locator_pool, li);
+
+             /* found local locator with the needed sw_if_index */
+             if (sl->sw_if_index == esi)
+               {
+                 /* and it has an address */
+                 if (0 == ip_interface_get_first_ip_address (lcm,
+                                                             sl->sw_if_index,
+                                                             gid_address_ip_version
+                                                             (&rmt->address),
+                                                             lcl_addr))
+                   continue;
+
+                 memset (&pair, 0, sizeof (pair));
+                 ip_address_copy (&pair.rmt_loc,
+                                  &gid_address_ip (&rmt->address));
+                 ip_address_copy (&pair.lcl_loc, lcl_addr);
+                 pair.weight = rmt->weight;
+                 vec_add1 (locator_pairs[0], pair);
+                 found = 1;
+               }
+           }
+       }
+      else
+       break;
+    }
+
+  hash_free (checked);
+  return found;
+}
+
+static void
+gid_address_sd_to_flat (gid_address_t * dst, gid_address_t * src,
+                       fid_address_t * fid)
+{
+  ASSERT (GID_ADDR_SRC_DST == gid_address_type (src));
+
+  dst[0] = src[0];
+
+  switch (fid_addr_type (fid))
+    {
+    case FID_ADDR_IP_PREF:
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+      gid_address_ippref (dst) = fid_addr_ippref (fid);
+      break;
+    case FID_ADDR_MAC:
+      gid_address_type (dst) = GID_ADDR_MAC;
+      mac_copy (gid_address_mac (dst), fid_addr_mac (fid));
+      break;
+    default:
+      clib_warning ("Unsupported fid type %d!", fid_addr_type (fid));
+      break;
+    }
+}
+
+static void
+dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
+{
+  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, *a = &_a;
+  mapping_t *src_map, *dst_map;
+  u32 sw_if_index;
+  uword *feip = 0, *dpid;
+  fwd_entry_t *fe;
+  u8 type, is_src_dst = 0;
+
+  memset (a, 0, sizeof (*a));
+
+  /* remove entry if it already exists */
+  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
+  if (feip)
+    dp_del_fwd_entry (lcm, src_map_index, dst_map_index);
+
+  if (lcm->lisp_pitr)
+    src_map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+  else
+    src_map = pool_elt_at_index (lcm->mapping_pool, src_map_index);
+  dst_map = pool_elt_at_index (lcm->mapping_pool, dst_map_index);
+
+  /* insert data plane forwarding entry */
+  a->is_add = 1;
+
+  if (GID_ADDR_SRC_DST == gid_address_type (&dst_map->eid))
+    {
+      gid_address_sd_to_flat (&a->rmt_eid, &dst_map->eid,
+                             &gid_address_sd_dst (&dst_map->eid));
+      gid_address_sd_to_flat (&a->lcl_eid, &dst_map->eid,
+                             &gid_address_sd_src (&dst_map->eid));
+      is_src_dst = 1;
+    }
+  else
+    gid_address_copy (&a->rmt_eid, &dst_map->eid);
+
+  a->vni = gid_address_vni (&a->rmt_eid);
+
+  /* get vrf or bd_index associated to vni */
+  type = gid_address_type (&a->rmt_eid);
+  if (GID_ADDR_IP_PREFIX == type)
+    {
+      dpid = hash_get (lcm->table_id_by_vni, a->vni);
+      if (!dpid)
+       {
+         clib_warning ("vni %d not associated to a vrf!", a->vni);
+         return;
+       }
+      a->table_id = dpid[0];
+    }
+  else if (GID_ADDR_MAC == type)
+    {
+      dpid = hash_get (lcm->bd_id_by_vni, a->vni);
+      if (!dpid)
+       {
+         clib_warning ("vni %d not associated to a bridge domain !", a->vni);
+         return;
+       }
+      a->bd_id = dpid[0];
+    }
+
+  /* find best locator pair that 1) verifies LISP policy 2) are connected */
+  if (0 == get_locator_pairs (lcm, src_map, dst_map, &a->locator_pairs))
+    {
+      /* negative entry */
+      a->is_negative = 1;
+      a->action = dst_map->action;
+    }
+
+  /* TODO remove */
+  u8 ipver = ip_prefix_version (&gid_address_ippref (&a->rmt_eid));
+  a->decap_next_index = (ipver == IP4) ?
+    LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
+
+  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
+
+  /* add tunnel to fwd entry table XXX check return value from DP insertion */
+  pool_get (lcm->fwd_entry_pool, fe);
+  fe->locator_pairs = a->locator_pairs;
+  gid_address_copy (&fe->reid, &a->rmt_eid);
+  gid_address_copy (&fe->leid, &src_map->eid);
+  fe->is_src_dst = is_src_dst;
+  hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index,
+           fe - lcm->fwd_entry_pool);
+}
+
+/**
+ * Returns vector of adjacencies.
+ *
+ * The caller must free the vector returned by this function.
+ *
+ * @param vni virtual network identifier
+ * @return vector of adjacencies
+ */
+lisp_adjacency_t *
+vnet_lisp_adjacencies_get_by_vni (u32 vni)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  fwd_entry_t *fwd;
+  lisp_adjacency_t *adjs = 0, adj;
+
+  /* *INDENT-OFF* */
+  pool_foreach(fwd, lcm->fwd_entry_pool,
+  ({
+    if (gid_address_vni (&fwd->reid) != vni)
+      continue;
+
+    gid_address_copy (&adj.reid, &fwd->reid);
+    gid_address_copy (&adj.leid, &fwd->leid);
+    vec_add1 (adjs, adj);
+  }));
+  /* *INDENT-ON* */
+
+  return adjs;
+}
+
+static clib_error_t *
+lisp_show_adjacencies_command_fn (vlib_main_t * vm,
+                                 unformat_input_t * input,
+                                 vlib_cli_command_t * cmd)
+{
+  lisp_adjacency_t *adjs, *adj;
+  vlib_cli_output (vm, "%s %40s\n", "leid", "reid");
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 vni = ~0;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "vni %d", &vni))
+       ;
+      else
+       {
+         vlib_cli_output (vm, "parse error: '%U'",
+                          format_unformat_error, line_input);
+         return 0;
+       }
+    }
+
+  if (~0 == vni)
+    {
+      vlib_cli_output (vm, "error: no vni specified!");
+      return 0;
+    }
+
+  adjs = vnet_lisp_adjacencies_get_by_vni (vni);
+
+  vec_foreach (adj, adjs)
+  {
+    vlib_cli_output (vm, "%U %40U\n", format_gid_address, &adj->leid,
+                    format_gid_address, &adj->reid);
+  }
+  vec_free (adjs);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_adjacencies_command) = {
+    .path = "show lisp adjacencies",
+    .short_help = "show lisp adjacencies",
+    .function = lisp_show_adjacencies_command_fn,
+};
+/* *INDENT-ON* */
+
+/**
+ * Add/remove mapping to/from map-cache. Overwriting not allowed.
+ */
+int
+vnet_lisp_map_cache_add_del (vnet_lisp_add_del_mapping_args_t * a,
+                            u32 * map_index_result)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 mi, *map_indexp, map_index, i;
+  mapping_t *m, *old_map;
+  u32 **eid_indexes;
+
+  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->eid);
+  old_map = mi != ~0 ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
+  if (a->is_add)
+    {
+      /* TODO check if overwriting and take appropriate actions */
+      if (mi != GID_LOOKUP_MISS && !gid_address_cmp (&old_map->eid, &a->eid))
+       {
+         clib_warning ("eid %U found in the eid-table", format_gid_address,
+                       &a->eid);
+         return VNET_API_ERROR_VALUE_EXIST;
+       }
+
+      pool_get (lcm->mapping_pool, m);
+      gid_address_copy (&m->eid, &a->eid);
+      m->locator_set_index = a->locator_set_index;
+      m->ttl = a->ttl;
+      m->action = a->action;
+      m->local = a->local;
+      m->is_static = a->is_static;
+
+      map_index = m - lcm->mapping_pool;
+      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, map_index,
+                             1);
+
+      if (pool_is_free_index (lcm->locator_set_pool, a->locator_set_index))
+       {
+         clib_warning ("Locator set with index %d doesn't exist",
+                       a->locator_set_index);
+         return VNET_API_ERROR_INVALID_VALUE;
+       }
+
+      /* add eid to list of eids supported by locator-set */
+      vec_validate (lcm->locator_set_to_eids, a->locator_set_index);
+      eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
+                                     a->locator_set_index);
+      vec_add1 (eid_indexes[0], map_index);
+
+      if (a->local)
+       {
+         /* mark as local */
+         vec_add1 (lcm->local_mappings_indexes, map_index);
+       }
+      map_index_result[0] = map_index;
+    }
+  else
+    {
+      if (mi == GID_LOOKUP_MISS)
+       {
+         clib_warning ("eid %U not found in the eid-table",
+                       format_gid_address, &a->eid);
+         return VNET_API_ERROR_INVALID_VALUE;
+       }
+
+      /* clear locator-set to eids binding */
+      eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids,
+                                     a->locator_set_index);
+      for (i = 0; i < vec_len (eid_indexes[0]); i++)
+       {
+         map_indexp = vec_elt_at_index (eid_indexes[0], i);
+         if (map_indexp[0] == mi)
+           break;
+       }
+      vec_del1 (eid_indexes[0], i);
+
+      /* remove local mark if needed */
+      m = pool_elt_at_index (lcm->mapping_pool, mi);
+      if (m->local)
+       {
+         u32 k, *lm_indexp;
+         for (k = 0; k < vec_len (lcm->local_mappings_indexes); k++)
+           {
+             lm_indexp = vec_elt_at_index (lcm->local_mappings_indexes, k);
+             if (lm_indexp[0] == mi)
+               break;
+           }
+         vec_del1 (lcm->local_mappings_indexes, k);
+       }
+
+      /* remove mapping from dictionary */
+      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->eid, 0, 0);
+      gid_address_free (&m->eid);
+      pool_put_index (lcm->mapping_pool, mi);
+    }
+
+  return 0;
+}
+
+/**
+ *  Add/update/delete mapping to/in/from map-cache.
+ */
+int
+vnet_lisp_add_del_local_mapping (vnet_lisp_add_del_mapping_args_t * a,
+                                u32 * map_index_result)
+{
+  uword *dp_table = 0;
+  u32 vni;
+  u8 type;
+
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  vni = gid_address_vni (&a->eid);
+  type = gid_address_type (&a->eid);
+  if (GID_ADDR_IP_PREFIX == type)
+    dp_table = hash_get (lcm->table_id_by_vni, vni);
+  else if (GID_ADDR_MAC == type)
+    dp_table = hash_get (lcm->bd_id_by_vni, vni);
+
+  if (!dp_table)
+    {
+      clib_warning ("vni %d not associated to a %s!", vni,
+                   GID_ADDR_IP_PREFIX == type ? "vrf" : "bd");
+      return VNET_API_ERROR_INVALID_VALUE;
+    }
+
+  /* store/remove mapping from map-cache */
+  return vnet_lisp_map_cache_add_del (a, map_index_result);
+}
+
+static clib_error_t *
+lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
+                                  vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  gid_address_t eid;
+  gid_address_t *eids = 0;
+  clib_error_t *error = 0;
+  u8 *locator_set_name = 0;
+  u32 locator_set_index = 0, map_index = 0;
+  uword *p;
+  vnet_lisp_add_del_mapping_args_t _a, *a = &_a;
+  int rv = 0;
+  u32 vni = 0;
+
+  memset (&eid, 0, sizeof (eid));
+  memset (a, 0, sizeof (*a));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+       is_add = 1;
+      else if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
+       ;
+      else if (unformat (line_input, "vni %d", &vni))
+       gid_address_vni (&eid) = vni;
+      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
+       {
+         p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+         if (!p)
+           {
+             error = clib_error_return (0, "locator-set %s doesn't exist",
+                                        locator_set_name);
+             goto done;
+           }
+         locator_set_index = p[0];
+       }
+      else
+       {
+         error = unformat_parse_error (line_input);
+         goto done;
+       }
+    }
+  /* XXX treat batch configuration */
+
+  if (GID_ADDR_SRC_DST == gid_address_type (&eid))
+    {
+      error =
+       clib_error_return (0, "src/dst is not supported for local EIDs!");
+      goto done;
+    }
+
+  gid_address_copy (&a->eid, &eid);
+  a->is_add = is_add;
+  a->locator_set_index = locator_set_index;
+  a->local = 1;
+
+  rv = vnet_lisp_add_del_local_mapping (a, &map_index);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s local mapping!",
+                                is_add ? "add" : "delete");
+    }
+done:
+  vec_free (eids);
+  if (locator_set_name)
+    vec_free (locator_set_name);
+  gid_address_free (&a->eid);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = {
+    .path = "lisp eid-table",
+    .short_help = "lisp eid-table add/del [vni <vni>] eid <eid> "
+      "locator-set <locator-set>",
+    .function = lisp_add_del_local_eid_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_eid_table_map (u32 vni, u32 dp_id, u8 is_l2, u8 is_add)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *dp_idp, *vnip, **dp_table_by_vni, **vni_by_dp_table;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return -1;
+    }
+
+  dp_table_by_vni = is_l2 ? &lcm->bd_id_by_vni : &lcm->table_id_by_vni;
+  vni_by_dp_table = is_l2 ? &lcm->vni_by_bd_id : &lcm->vni_by_table_id;
+
+  if (!is_l2 && (vni == 0 || dp_id == 0))
+    {
+      clib_warning ("can't add/del default vni-vrf mapping!");
+      return -1;
+    }
+
+  dp_idp = hash_get (dp_table_by_vni[0], vni);
+  vnip = hash_get (vni_by_dp_table[0], dp_id);
+
+  if (is_add)
+    {
+      if (dp_idp || vnip)
+       {
+         clib_warning ("vni %d or vrf %d already used in vrf/vni "
+                       "mapping!", vni, dp_id);
+         return -1;
+       }
+      hash_set (dp_table_by_vni[0], vni, dp_id);
+      hash_set (vni_by_dp_table[0], dp_id, vni);
+
+      /* create dp iface */
+      dp_add_del_iface (lcm, vni, is_l2, 1);
+    }
+  else
+    {
+      if (!dp_idp || !vnip)
+       {
+         clib_warning ("vni %d or vrf %d not used in any vrf/vni! "
+                       "mapping!", vni, dp_id);
+         return -1;
+       }
+      hash_unset (dp_table_by_vni[0], vni);
+      hash_unset (vni_by_dp_table[0], dp_id);
+
+      /* remove dp iface */
+      dp_add_del_iface (lcm, vni, is_l2, 0);
+    }
+  return 0;
+
+}
+
+static clib_error_t *
+lisp_eid_table_map_command_fn (vlib_main_t * vm,
+                              unformat_input_t * input,
+                              vlib_cli_command_t * cmd)
+{
+  u8 is_add = 1, is_l2 = 0;
+  u32 vni = 0, dp_id = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "vni %d", &vni))
+       ;
+      else if (unformat (line_input, "vrf %d", &dp_id))
+       ;
+      else if (unformat (line_input, "bd %d", &dp_id))
+       is_l2 = 1;
+      else
+       {
+         return unformat_parse_error (line_input);
+       }
+    }
+  vnet_lisp_eid_table_map (vni, dp_id, is_l2, is_add);
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_eid_table_map_command) = {
+    .path = "lisp eid-table map",
+    .short_help = "lisp eid-table map [del] vni <vni> vrf <vrf> | bd <bdi>",
+    .function = lisp_eid_table_map_command_fn,
+};
+/* *INDENT-ON* */
+
+/* return 0 if the two locator sets are identical 1 otherwise */
+static u8
+compare_locators (lisp_cp_main_t * lcm, u32 * old_ls_indexes,
+                 locator_t * new_locators)
+{
+  u32 i, old_li;
+  locator_t *old_loc, *new_loc;
+
+  if (vec_len (old_ls_indexes) != vec_len (new_locators))
+    return 1;
+
+  for (i = 0; i < vec_len (new_locators); i++)
+    {
+      old_li = vec_elt (old_ls_indexes, i);
+      old_loc = pool_elt_at_index (lcm->locator_pool, old_li);
+
+      new_loc = vec_elt_at_index (new_locators, i);
+
+      if (locator_cmp (old_loc, new_loc))
+       return 1;
+    }
+  return 0;
+}
+
+/**
+ * Adds/removes/updates mapping. Does not program forwarding.
+ *
+ * @param eid end-host identifier
+ * @param rlocs vector of remote locators
+ * @param action action for negative map-reply
+ * @param is_add add mapping if non-zero, delete otherwise
+ * @param res_map_index the map-index that was created/updated/removed. It is
+ *                      set to ~0 if no action is taken.
+ * @param is_static used for distinguishing between statically learned
+                    remote mappings and mappings obtained from MR
+ * @return return code
+ */
+int
+vnet_lisp_add_del_mapping (gid_address_t * eid, locator_t * rlocs, u8 action,
+                          u8 authoritative, u32 ttl, u8 is_add, u8 is_static,
+                          u32 * res_map_index)
+{
+  vnet_lisp_add_del_mapping_args_t _m_args, *m_args = &_m_args;
+  vnet_lisp_add_del_locator_set_args_t _ls_args, *ls_args = &_ls_args;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 mi, ls_index = 0, dst_map_index;
+  mapping_t *old_map;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (res_map_index)
+    res_map_index[0] = ~0;
+
+  memset (m_args, 0, sizeof (m_args[0]));
+  memset (ls_args, 0, sizeof (ls_args[0]));
+
+  ls_args->locators = rlocs;
+
+  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, eid);
+  old_map = ((u32) ~ 0 != mi) ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
+
+  if (is_add)
+    {
+      /* overwrite: if mapping already exists, decide if locators should be
+       * updated and be done */
+      if (old_map && gid_address_cmp (&old_map->eid, eid) == 0)
+       {
+         if (!is_static && (old_map->is_static || old_map->local))
+           {
+             /* do not overwrite local or static remote mappings */
+             clib_warning ("mapping %U rejected due to collision with local "
+                           "or static remote mapping!", format_gid_address,
+                           &eid);
+             return 0;
+           }
+
+         locator_set_t *old_ls;
+
+         /* update mapping attributes */
+         old_map->action = action;
+         old_map->authoritative = authoritative;
+         old_map->ttl = ttl;
+
+         old_ls = pool_elt_at_index (lcm->locator_set_pool,
+                                     old_map->locator_set_index);
+         if (compare_locators (lcm, old_ls->locator_indices,
+                               ls_args->locators))
+           {
+             /* set locator-set index to overwrite */
+             ls_args->is_add = 1;
+             ls_args->index = old_map->locator_set_index;
+             vnet_lisp_add_del_locator_set (ls_args, 0);
+             if (res_map_index)
+               res_map_index[0] = mi;
+           }
+       }
+      /* new mapping */
+      else
+       {
+         ls_args->is_add = 1;
+         ls_args->index = ~0;
+
+         vnet_lisp_add_del_locator_set (ls_args, &ls_index);
+
+         /* add mapping */
+         gid_address_copy (&m_args->eid, eid);
+         m_args->is_add = 1;
+         m_args->action = action;
+         m_args->locator_set_index = ls_index;
+         m_args->is_static = is_static;
+         vnet_lisp_map_cache_add_del (m_args, &dst_map_index);
+
+         if (res_map_index)
+           res_map_index[0] = dst_map_index;
+       }
+    }
+  else
+    {
+      if (old_map == 0 || gid_address_cmp (&old_map->eid, eid) != 0)
+       {
+         clib_warning ("cannot delete mapping for eid %U",
+                       format_gid_address, eid);
+         return -1;
+       }
+
+      m_args->is_add = 0;
+      gid_address_copy (&m_args->eid, eid);
+      m_args->locator_set_index = old_map->locator_set_index;
+
+      /* delete mapping associated from map-cache */
+      vnet_lisp_map_cache_add_del (m_args, 0);
+
+      ls_args->is_add = 0;
+      ls_args->index = old_map->locator_set_index;
+      /* delete locator set */
+      vnet_lisp_add_del_locator_set (ls_args, 0);
+
+      /* return old mapping index */
+      if (res_map_index)
+       res_map_index[0] = mi;
+    }
+
+  /* success */
+  return 0;
+}
+
+int
+vnet_lisp_clear_all_remote_adjacencies (void)
+{
+  int rv = 0;
+  u32 mi, *map_indices = 0, *map_indexp;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  vnet_lisp_add_del_mapping_args_t _dm_args, *dm_args = &_dm_args;
+  vnet_lisp_add_del_locator_set_args_t _ls, *ls = &_ls;
+
+  /* *INDENT-OFF* */
+  pool_foreach_index (mi, lcm->mapping_pool,
+  ({
+    vec_add1 (map_indices, mi);
+  }));
+  /* *INDENT-ON* */
+
+  vec_foreach (map_indexp, map_indices)
+  {
+    mapping_t *map = pool_elt_at_index (lcm->mapping_pool, map_indexp[0]);
+    if (!map->local)
+      {
+       dp_del_fwd_entry (lcm, 0, map_indexp[0]);
+
+       dm_args->is_add = 0;
+       gid_address_copy (&dm_args->eid, &map->eid);
+       dm_args->locator_set_index = map->locator_set_index;
+
+       /* delete mapping associated to fwd entry */
+       vnet_lisp_map_cache_add_del (dm_args, 0);
+
+       ls->is_add = 0;
+       ls->local = 0;
+       ls->index = map->locator_set_index;
+       /* delete locator set */
+       rv = vnet_lisp_add_del_locator_set (ls, 0);
+       if (rv != 0)
+         goto cleanup;
+      }
+  }
+
+cleanup:
+  if (map_indices)
+    vec_free (map_indices);
+  return rv;
+}
+
+/**
+ * Adds adjacency or removes forwarding entry associated to remote mapping.
+ * Note that adjacencies are not stored, they only result in forwarding entries
+ * being created.
+ */
+int
+lisp_add_del_adjacency (lisp_cp_main_t * lcm, gid_address_t * local_eid,
+                       gid_address_t * remote_eid, u8 is_add)
+{
+  u32 local_mi, remote_mi = ~0;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  remote_mi = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid,
+                                       remote_eid, local_eid);
+  if (GID_LOOKUP_MISS == remote_mi)
+    {
+      clib_warning ("Remote eid %U not found. Cannot add adjacency!",
+                   format_gid_address, remote_eid);
+
+      return -1;
+    }
+
+  if (is_add)
+    {
+      /* TODO 1) check if src/dst 2) once we have src/dst working, use it in
+       * delete*/
+
+      /* check if source eid has an associated mapping. If pitr mode is on,
+       * just use the pitr's mapping */
+      local_mi = lcm->lisp_pitr ? lcm->pitr_map_index :
+       gid_dictionary_lookup (&lcm->mapping_index_by_gid, local_eid);
+
+
+      if (GID_LOOKUP_MISS == local_mi)
+       {
+         clib_warning ("Local eid %U not found. Cannot add adjacency!",
+                       format_gid_address, local_eid);
+
+         return -1;
+       }
+
+      /* update forwarding */
+      dp_add_fwd_entry (lcm, local_mi, remote_mi);
+    }
+  else
+    dp_del_fwd_entry (lcm, 0, remote_mi);
+
+  return 0;
+}
+
+int
+vnet_lisp_add_del_adjacency (vnet_lisp_add_del_adjacency_args_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lisp_add_del_adjacency (lcm, &a->leid, &a->reid, a->is_add);
+}
+
+/**
+ * Handler for add/del remote mapping CLI.
+ *
+ * @param vm vlib context
+ * @param input input from user
+ * @param cmd cmd
+ * @return pointer to clib error structure
+ */
+static clib_error_t *
+lisp_add_del_remote_mapping_command_fn (vlib_main_t * vm,
+                                       unformat_input_t * input,
+                                       vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1, del_all = 0;
+  locator_t rloc, *rlocs = 0, *curr_rloc = 0;
+  gid_address_t eid;
+  u8 eid_set = 0;
+  u32 vni, action = ~0, p, w;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  memset (&eid, 0, sizeof (eid));
+  memset (&rloc, 0, sizeof (rloc));
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del-all"))
+       del_all = 1;
+      else if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "add"))
+       ;
+      else if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
+       eid_set = 1;
+      else if (unformat (line_input, "vni %u", &vni))
+       {
+         gid_address_vni (&eid) = vni;
+       }
+      else if (unformat (line_input, "p %d w %d", &p, &w))
+       {
+         if (!curr_rloc)
+           {
+             clib_warning
+               ("No RLOC configured for setting priority/weight!");
+             goto done;
+           }
+         curr_rloc->priority = p;
+         curr_rloc->weight = w;
+       }
+      else if (unformat (line_input, "rloc %U", unformat_ip_address,
+                        &gid_address_ip (&rloc.address)))
+       {
+         /* since rloc is stored in ip prefix we need to set prefix length */
+         ip_prefix_t *pref = &gid_address_ippref (&rloc.address);
+
+         u8 version = gid_address_ip_version (&rloc.address);
+         ip_prefix_len (pref) = ip_address_max_len (version);
+
+         vec_add1 (rlocs, rloc);
+         curr_rloc = &rlocs[vec_len (rlocs) - 1];
+       }
+      else if (unformat (line_input, "action %U",
+                        unformat_negative_mapping_action, &action))
+       ;
+      else
+       {
+         clib_warning ("parse error");
+         goto done;
+       }
+    }
+
+  if (!eid_set)
+    {
+      clib_warning ("missing eid!");
+      goto done;
+    }
+
+  if (!del_all)
+    {
+      if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+       {
+         clib_warning ("no action set for negative map-reply!");
+         goto done;
+       }
+    }
+  else
+    {
+      vnet_lisp_clear_all_remote_adjacencies ();
+      goto done;
+    }
+
+  /* TODO build src/dst with seid */
+
+  /* if it's a delete, clean forwarding */
+  if (!is_add)
+    {
+      lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+      rv = lisp_add_del_adjacency (lcm, 0, &eid, /* is_add */ 0);
+      if (rv)
+       {
+         goto done;
+       }
+    }
+
+  /* add as static remote mapping, i.e., not authoritative and infinite
+   * ttl */
+  rv = vnet_lisp_add_del_mapping (&eid, rlocs, action, 0, ~0, is_add,
+                                 1 /* is_static */ , 0);
+
+  if (rv)
+    clib_warning ("failed to %s remote mapping!", is_add ? "add" : "delete");
+
+done:
+  vec_free (rlocs);
+  unformat_free (line_input);
+  return error;
+}
+
+VLIB_CLI_COMMAND (lisp_add_del_remote_mapping_command) =
+{
+.path = "lisp remote-mapping",.short_help =
+    "lisp remote-mapping add|del [del-all] vni <vni> "
+    "eid <est-eid> [action <no-action|natively-forward|"
+    "send-map-request|drop>] rloc <dst-locator> p <prio> w <weight> "
+    "[rloc <dst-locator> ... ]",.function =
+    lisp_add_del_remote_mapping_command_fn,};
+
+/**
+ * Handler for add/del adjacency CLI.
+ */
+static clib_error_t *
+lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
+                                  vlib_cli_command_t * cmd)
+{
+  clib_error_t *error = 0;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
+  u8 is_add = 1;
+  ip_prefix_t *reid_ippref, *leid_ippref;
+  gid_address_t leid, reid;
+  u8 *dmac = gid_address_mac (&reid);
+  u8 *smac = gid_address_mac (&leid);
+  u8 reid_set = 0, leid_set = 0;
+  u32 vni;
+  int rv;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  memset (&reid, 0, sizeof (reid));
+  memset (&leid, 0, sizeof (leid));
+
+  leid_ippref = &gid_address_ippref (&leid);
+  reid_ippref = &gid_address_ippref (&reid);
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "add"))
+       ;
+      else if (unformat (line_input, "reid %U",
+                        unformat_ip_prefix, reid_ippref))
+       {
+         gid_address_type (&reid) = GID_ADDR_IP_PREFIX;
+         reid_set = 1;
+       }
+      else if (unformat (line_input, "reid %U", unformat_mac_address, dmac))
+       {
+         gid_address_type (&reid) = GID_ADDR_MAC;
+         reid_set = 1;
+       }
+      else if (unformat (line_input, "vni %u", &vni))
+       {
+         gid_address_vni (&leid) = vni;
+         gid_address_vni (&reid) = vni;
+       }
+      else if (unformat (line_input, "leid %U",
+                        unformat_ip_prefix, leid_ippref))
+       {
+         gid_address_type (&leid) = GID_ADDR_IP_PREFIX;
+         leid_set = 1;
+       }
+      else if (unformat (line_input, "leid %U", unformat_mac_address, smac))
+       {
+         gid_address_type (&leid) = GID_ADDR_MAC;
+         leid_set = 1;
+       }
+      else
+       {
+         clib_warning ("parse error");
+         goto done;
+       }
+    }
+
+  if (!reid_set || !leid_set)
+    {
+      clib_warning ("missing remote or local eid!");
+      goto done;
+    }
+
+  if ((gid_address_type (&leid) != gid_address_type (&reid))
+      || (gid_address_type (&reid) == GID_ADDR_IP_PREFIX
+         && ip_prefix_version (reid_ippref)
+         != ip_prefix_version (leid_ippref)))
+    {
+      clib_warning ("remote and local EIDs are of different types!");
+      return error;
+    }
+
+  memset (a, 0, sizeof (a[0]));
+  gid_address_copy (&a->leid, &leid);
+  gid_address_copy (&a->reid, &reid);
+
+  a->is_add = is_add;
+  rv = vnet_lisp_add_del_adjacency (a);
+
+  if (rv)
+    clib_warning ("failed to %s adjacency!", is_add ? "add" : "delete");
+
+done:
+  unformat_free (line_input);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = {
+    .path = "lisp adjacency",
+    .short_help = "lisp adjacency add|del vni <vni> reid <remote-eid> "
+      "leid <local-eid>",
+    .function = lisp_add_del_adjacency_command_fn,
+};
+/* *INDENT-ON* */
 
-/* Adds mapping to map-cache but does NOT program LISP forwarding */
 int
-vnet_lisp_add_del_mapping (vnet_lisp_add_del_mapping_args_t * a,
-                           u32 * map_index_result)
+vnet_lisp_set_map_request_mode (u8 mode)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  u32 mi, * map_indexp, map_index, i;
-  mapping_t * m;
-  u32 ** eid_indexes;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
 
-  mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->deid);
-  if (a->is_add)
+  if (vnet_lisp_enable_disable_status () == 0)
     {
-      /* TODO check if overwriting and take appropriate actions */
-      if (mi != GID_LOOKUP_MISS) {
-          clib_warning("eid %U found in the eid-table", format_ip_address,
-                       &a->deid);
-          return VNET_API_ERROR_VALUE_EXIST;
-      }
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
 
-      pool_get(lcm->mapping_pool, m);
-      m->eid = a->deid;
-      m->locator_set_index = a->locator_set_index;
-      m->ttl = a->ttl;
-      m->local = a->local;
+  if (mode >= _MR_MODE_MAX)
+    {
+      clib_warning ("Invalid LISP map request mode %d!", mode);
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
 
-      map_index = m - lcm->mapping_pool;
-      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->deid, map_index,
-                              1);
+  lcm->map_request_mode = mode;
+  return 0;
+}
 
-      if (pool_is_free_index(lcm->locator_set_pool, a->locator_set_index))
-        {
-          clib_warning("Locator set with index %d doesn't exist",
-                       a->locator_set_index);
-          return VNET_API_ERROR_INVALID_VALUE;
-        }
+static clib_error_t *
+lisp_map_request_mode_command_fn (vlib_main_t * vm,
+                                 unformat_input_t * input,
+                                 vlib_cli_command_t * cmd)
+{
+  unformat_input_t _i, *i = &_i;
+  map_request_mode_t mr_mode = _MR_MODE_MAX;
 
-      /* add eid to list of eids supported by locator-set */
-      vec_validate (lcm->locator_set_to_eids, a->locator_set_index);
-      eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids,
-                                     a->locator_set_index);
-      vec_add1(eid_indexes[0], map_index);
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, i))
+    return 0;
 
-      if (a->local)
-        {
-          /* mark as local */
-          vec_add1(lcm->local_mappings_indexes, map_index);
+  while (unformat_check_input (i) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (i, "dst-only"))
+       mr_mode = MR_MODE_DST_ONLY;
+      else if (unformat (i, "src-dst"))
+       mr_mode = MR_MODE_SRC_DST;
+      else
+       {
+         clib_warning ("parse error '%U'", format_unformat_error, i);
+         goto done;
+       }
+    }
 
-          /* XXX do something else? */
-        }
-      map_index_result[0] = map_index;
+  if (_MR_MODE_MAX == mr_mode)
+    {
+      clib_warning ("No LISP map request mode entered!");
+      return 0;
     }
-  else
+
+  vnet_lisp_set_map_request_mode (mr_mode);
+done:
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_map_request_mode_command) = {
+    .path = "lisp map-request mode",
+    .short_help = "lisp map-request mode dst-only|src-dst",
+    .function = lisp_map_request_mode_command_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_lisp_map_request_mode (u8 * s, va_list * args)
+{
+  u32 mode = va_arg (*args, u32);
+
+  switch (mode)
     {
-      if (mi == GID_LOOKUP_MISS) {
-          clib_warning("eid %U not found in the eid-table", format_ip_address,
-                       &a->deid);
-          return VNET_API_ERROR_INVALID_VALUE;
-      }
+    case 0:
+      return format (0, "dst-only");
+    case 1:
+      return format (0, "src-dst");
+    }
+  return 0;
+}
 
-      /* clear locator-set to eids binding */
-      eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids,
-                                     a->locator_set_index);
-      for (i = 0; i < vec_len(eid_indexes[0]); i++)
-        {
-          map_indexp = vec_elt_at_index(eid_indexes[0], i);
-          if (map_indexp[0] == mi)
-              break;
-        }
-      vec_del1(eid_indexes[0], i);
+static clib_error_t *
+lisp_show_map_request_mode_command_fn (vlib_main_t * vm,
+                                      unformat_input_t * input,
+                                      vlib_cli_command_t * cmd)
+{
+  vlib_cli_output (vm, "map-request mode: %U", format_lisp_map_request_mode,
+                  vnet_lisp_get_map_request_mode ());
+  return 0;
+}
 
-      /* remove local mark if needed */
-      m = pool_elt_at_index(lcm->mapping_pool, mi);
-      if (m->local)
-        {
-          u32 k, * lm_indexp;
-          for (k = 0; k < vec_len(lcm->local_mappings_indexes); k++)
-            {
-              lm_indexp = vec_elt_at_index(lcm->local_mappings_indexes, k);
-              if (lm_indexp[0] == mi)
-                break;
-            }
-          vec_del1(lcm->local_mappings_indexes, k);
-        }
-      else
-        {
-          /* remove tunnel ??? */
-        }
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_map_request_mode_command) = {
+    .path = "show lisp map-request mode",
+    .short_help = "show lisp map-request mode",
+    .function = lisp_show_map_request_mode_command_fn,
+};
+/* *INDENT-ON* */
 
-      /* remove mapping from dictionary */
-      gid_dictionary_add_del (&lcm->mapping_index_by_gid, &a->deid, 0, 0);
-      pool_put_index (lcm->mapping_pool, mi);
+static clib_error_t *
+lisp_show_map_resolvers_command_fn (vlib_main_t * vm,
+                                   unformat_input_t * input,
+                                   vlib_cli_command_t * cmd)
+{
+  map_resolver_t *mr;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  vec_foreach (mr, lcm->map_resolvers)
+  {
+    vlib_cli_output (vm, "%U", format_ip_address, &mr->address);
+  }
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_map_resolvers_command) = {
+    .path = "show lisp map-resolvers",
+    .short_help = "show lisp map-resolvers",
+    .function = lisp_show_map_resolvers_command_fn,
+};
+/* *INDENT-ON* */
+
+int
+vnet_lisp_pitr_set_locator_set (u8 * locator_set_name, u8 is_add)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 locator_set_index = ~0;
+  mapping_t *m;
+  uword *p;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  p = hash_get_mem (lcm->locator_set_index_by_name, locator_set_name);
+  if (!p)
+    {
+      clib_warning ("locator-set %v doesn't exist", locator_set_name);
+      return -1;
+    }
+  locator_set_index = p[0];
+
+  if (is_add)
+    {
+      pool_get (lcm->mapping_pool, m);
+      m->locator_set_index = locator_set_index;
+      m->local = 1;
+      lcm->pitr_map_index = m - lcm->mapping_pool;
+
+      /* enable pitr mode */
+      lcm->lisp_pitr = 1;
     }
+  else
+    {
+      /* remove pitr mapping */
+      pool_put_index (lcm->mapping_pool, lcm->pitr_map_index);
 
+      /* disable pitr mode */
+      lcm->lisp_pitr = 0;
+    }
   return 0;
 }
 
 static clib_error_t *
-lisp_add_del_local_eid_command_fn (vlib_main_t * vm, unformat_input_t * input,
-                                   vlib_cli_command_t * cmd)
+lisp_pitr_set_locator_set_command_fn (vlib_main_t * vm,
+                                     unformat_input_t * input,
+                                     vlib_cli_command_t * cmd)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  unformat_input_t _line_input, * line_input = &_line_input;
+  u8 locator_name_set = 0;
+  u8 *locator_set_name = 0;
   u8 is_add = 1;
-  gid_address_t eid;
-  ip_prefix_t * prefp = &gid_address_ippref(&eid);
-  gid_address_t * eids = 0;
-  clib_error_t * error = 0;
-  u8 * locator_set_name;
-  u32 locator_set_index = 0, map_index = 0;
-  uword * p;
-  vnet_lisp_add_del_mapping_args_t _a, * a = &_a;
-
-  gid_address_type (&eid) = IP_PREFIX;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  clib_error_t *error = 0;
+  int rv = 0;
 
   /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
+  if (!unformat_user (input, unformat_line_input, line_input))
     return 0;
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-      if (unformat (line_input, "add"))
-        is_add = 1;
-      else if (unformat (line_input, "del"))
-        is_add = 0;
-      else if (unformat (line_input, "eid %U", unformat_ip_prefix, prefp))
-        {
-          vec_add1(eids, eid);
-        }
-      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
-        {
-          p = hash_get_mem(lcm->locator_set_index_by_name, locator_set_name);
-          if (!p)
-            {
-              error = clib_error_return(0, "locator-set %s doesn't exist",
-                                        locator_set_name);
-              goto done;
-            }
-          locator_set_index = p[0];
-        }
+      if (unformat (line_input, "ls %_%v%_", &locator_set_name))
+       locator_name_set = 1;
+      else if (unformat (line_input, "disable"))
+       is_add = 0;
       else
-        {
-          error = unformat_parse_error(line_input);
-          goto done;
-        }
+       return clib_error_return (0, "parse error");
     }
 
-  /* XXX treat batch configuration */
-  a->deid = eid;
-  a->is_add = is_add;
-  a->locator_set_index = locator_set_index;
-  a->local = 1;
+  if (!locator_name_set)
+    {
+      clib_warning ("No locator set specified!");
+      goto done;
+    }
+  rv = vnet_lisp_pitr_set_locator_set (locator_set_name, is_add);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s pitr!",
+                                is_add ? "add" : "delete");
+    }
 
-  vnet_lisp_add_del_mapping (a, &map_index);
- done:
-  vec_free(eids);
+done:
+  if (locator_set_name)
+    vec_free (locator_set_name);
   return error;
 }
 
-VLIB_CLI_COMMAND (lisp_add_del_local_eid_command) = {
-    .path = "lisp eid-table",
-    .short_help = "lisp eid-table add/del eid <eid> locator-set <locator-set>",
-    .function = lisp_add_del_local_eid_command_fn,
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_pitr_set_locator_set_command) = {
+    .path = "lisp pitr",
+    .short_help = "lisp pitr [disable] ls <locator-set-name>",
+    .function = lisp_pitr_set_locator_set_command_fn,
 };
+/* *INDENT-ON* */
 
 static clib_error_t *
-lisp_show_local_eid_table_command_fn (vlib_main_t * vm,
-                                      unformat_input_t * input,
-                                      vlib_cli_command_t * cmd)
+lisp_show_pitr_command_fn (vlib_main_t * vm,
+                          unformat_input_t * input, vlib_cli_command_t * cmd)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  mapping_t * mapit;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  mapping_t *m;
+  locator_set_t *ls;
+  u8 *tmp_str = 0;
 
-  vlib_cli_output (vm, "%=20s%=16s", "EID", "Locator");
-  pool_foreach (mapit, lcm->mapping_pool,
-  ({
-    u8 * msg = 0;
-    locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool,
-                                            mapit->locator_set_index);
-    vlib_cli_output (vm, "%-16U%16v", format_gid_address, &mapit->eid,
-                     ls->name);
-    vec_free (msg);
-  }));
+  vlib_cli_output (vm, "%=20s%=16s",
+                  "pitr", lcm->lisp_pitr ? "locator-set" : "");
+
+  if (!lcm->lisp_pitr)
+    {
+      vlib_cli_output (vm, "%=20s", "disable");
+      return 0;
+    }
+
+  if (~0 == lcm->pitr_map_index)
+    {
+      tmp_str = format (0, "N/A");
+    }
+  else
+    {
+      m = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+      if (~0 != m->locator_set_index)
+       {
+         ls =
+           pool_elt_at_index (lcm->locator_set_pool, m->locator_set_index);
+         tmp_str = format (0, "%s", ls->name);
+       }
+      else
+       {
+         tmp_str = format (0, "N/A");
+       }
+    }
+  vec_add1 (tmp_str, 0);
+
+  vlib_cli_output (vm, "%=20s%=16s", "enable", tmp_str);
+
+  vec_free (tmp_str);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_pitr_command) = {
+    .path = "show lisp pitr",
+    .short_help = "Show pitr",
+    .function = lisp_show_pitr_command_fn,
+};
+/* *INDENT-ON* */
+
+static u8 *
+format_eid_entry (u8 * s, va_list * args)
+{
+  vnet_main_t *vnm = va_arg (*args, vnet_main_t *);
+  lisp_cp_main_t *lcm = va_arg (*args, lisp_cp_main_t *);
+  mapping_t *mapit = va_arg (*args, mapping_t *);
+  locator_set_t *ls = va_arg (*args, locator_set_t *);
+  gid_address_t *gid = &mapit->eid;
+  u32 ttl = mapit->ttl;
+  u8 aut = mapit->authoritative;
+  u32 *loc_index;
+  u8 first_line = 1;
+  u8 *loc;
+
+  u8 *type = ls->local ? format (0, "local(%s)", ls->name)
+    : format (0, "remote");
+
+  if (vec_len (ls->locator_indices) == 0)
+    {
+      s = format (s, "%-35U%-30s%-20u%-u", format_gid_address, gid,
+                 type, ttl, aut);
+    }
+  else
+    {
+      vec_foreach (loc_index, ls->locator_indices)
+      {
+       locator_t *l = pool_elt_at_index (lcm->locator_pool, loc_index[0]);
+       if (l->local)
+         loc = format (0, "%U", format_vnet_sw_if_index_name, vnm,
+                       l->sw_if_index);
+       else
+         loc = format (0, "%U", format_ip_address,
+                       &gid_address_ip (&l->address));
+
+       if (first_line)
+         {
+           s = format (s, "%-35U%-20s%-30v%-20u%-u\n", format_gid_address,
+                       gid, type, loc, ttl, aut);
+           first_line = 0;
+         }
+       else
+         s = format (s, "%55s%v\n", "", loc);
+      }
+    }
+  return s;
+}
+
+static clib_error_t *
+lisp_show_eid_table_command_fn (vlib_main_t * vm,
+                               unformat_input_t * input,
+                               vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  mapping_t *mapit;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u32 mi;
+  gid_address_t eid;
+  u8 print_all = 1;
+  u8 filter = 0;
+
+  memset (&eid, 0, sizeof (eid));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "eid %U", unformat_gid_address, &eid))
+       print_all = 0;
+      else if (unformat (line_input, "local"))
+       filter = 1;
+      else if (unformat (line_input, "remote"))
+       filter = 2;
+      else
+       return clib_error_return (0, "parse error: '%U'",
+                                 format_unformat_error, line_input);
+    }
+
+  vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
+                  "EID", "type", "locators", "ttl", "autoritative");
+
+  if (print_all)
+    {
+      /* *INDENT-OFF* */
+      pool_foreach (mapit, lcm->mapping_pool,
+      ({
+        locator_set_t * ls = pool_elt_at_index (lcm->locator_set_pool,
+                                                mapit->locator_set_index);
+        if (filter && !((1 == filter && ls->local) ||
+          (2 == filter && !ls->local)))
+          {
+            continue;
+          }
+        vlib_cli_output (vm, "%U", format_eid_entry, lcm->vnet_main,
+                         lcm, mapit, ls);
+      }));
+      /* *INDENT-ON* */
+    }
+  else
+    {
+      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &eid);
+      if ((u32) ~ 0 == mi)
+       return 0;
+
+      mapit = pool_elt_at_index (lcm->mapping_pool, mi);
+      locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool,
+                                            mapit->locator_set_index);
+
+      if (filter && !((1 == filter && ls->local) ||
+                     (2 == filter && !ls->local)))
+       {
+         return 0;
+       }
+
+      vlib_cli_output (vm, "%U,", format_eid_entry, lcm->vnet_main,
+                      lcm, mapit, ls);
+    }
 
   return 0;
 }
 
-VLIB_CLI_COMMAND (lisp_cp_show_local_eid_table_command) = {
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_show_eid_table_command) = {
     .path = "show lisp eid-table",
-    .short_help = "Shows local EID table",
-    .function = lisp_show_local_eid_table_command_fn,
+    .short_help = "Shows EID table",
+    .function = lisp_show_eid_table_command_fn,
 };
+/* *INDENT-ON* */
 
 /* cleans locator to locator-set data and removes locators not part of
  * any locator-set */
 static void
 clean_locator_to_locator_set (lisp_cp_main_t * lcm, u32 lsi)
 {
-  u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes;
-  locator_set_t * ls = pool_elt_at_index(lcm->locator_set_pool, lsi);
-  for (i = 0; i < vec_len(ls->locator_indices); i++)
+  u32 i, j, *loc_indexp, *ls_indexp, **ls_indexes, *to_be_deleted = 0;
+  locator_set_t *ls = pool_elt_at_index (lcm->locator_set_pool, lsi);
+  for (i = 0; i < vec_len (ls->locator_indices); i++)
     {
-      loc_indexp = vec_elt_at_index(ls->locator_indices, i);
-      ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
-                                    loc_indexp[0]);
-      for (j = 0; j < vec_len(ls_indexes[0]); j++)
-        {
-          ls_indexp = vec_elt_at_index(ls_indexes[0], j);
-          if (ls_indexp[0] == lsi)
-            break;
-        }
-
-      /* delete index for removed locator-set*/
-      vec_del1(ls_indexes[0], j);
+      loc_indexp = vec_elt_at_index (ls->locator_indices, i);
+      ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
+                                    loc_indexp[0]);
+      for (j = 0; j < vec_len (ls_indexes[0]); j++)
+       {
+         ls_indexp = vec_elt_at_index (ls_indexes[0], j);
+         if (ls_indexp[0] == lsi)
+           break;
+       }
+
+      /* delete index for removed locator-set */
+      vec_del1 (ls_indexes[0], j);
 
       /* delete locator if it's part of no locator-set */
       if (vec_len (ls_indexes[0]) == 0)
-        pool_put_index(lcm->locator_pool, loc_indexp[0]);
+       {
+         pool_put_index (lcm->locator_pool, loc_indexp[0]);
+         vec_add1 (to_be_deleted, i);
+       }
+    }
+
+  if (to_be_deleted)
+    {
+      for (i = 0; i < vec_len (to_be_deleted); i++)
+       {
+         loc_indexp = vec_elt_at_index (to_be_deleted, i);
+         vec_del1 (ls->locator_indices, loc_indexp[0]);
+       }
+      vec_free (to_be_deleted);
+    }
+}
+
+static inline uword *
+get_locator_set_index (vnet_lisp_add_del_locator_set_args_t * a, uword * p)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  ASSERT (a != NULL);
+  ASSERT (p != NULL);
+
+  /* find locator-set */
+  if (a->local)
+    {
+      p = hash_get_mem (lcm->locator_set_index_by_name, a->name);
+    }
+  else
+    {
+      *p = a->index;
+    }
+
+  return p;
+}
+
+static inline int
+is_locator_in_locator_set (lisp_cp_main_t * lcm, locator_set_t * ls,
+                          locator_t * loc)
+{
+  locator_t *itloc;
+  u32 *locit;
+
+  ASSERT (ls != NULL);
+  ASSERT (loc != NULL);
+
+  vec_foreach (locit, ls->locator_indices)
+  {
+    itloc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+    if ((ls->local && itloc->sw_if_index == loc->sw_if_index) ||
+       (!ls->local && !gid_address_cmp (&itloc->address, &loc->address)))
+      {
+       clib_warning ("Duplicate locator");
+       return VNET_API_ERROR_VALUE_EXIST;
+      }
+  }
+
+  return 0;
+}
+
+static inline void
+remove_locator_from_locator_set (locator_set_t * ls, u32 * locit,
+                                u32 ls_index, u32 loc_id)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  u32 **ls_indexes = NULL;
+
+  ASSERT (ls != NULL);
+  ASSERT (locit != NULL);
+
+  ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets, locit[0]);
+  pool_put_index (lcm->locator_pool, locit[0]);
+  vec_del1 (ls->locator_indices, loc_id);
+  vec_del1 (ls_indexes[0], ls_index);
+}
+
+int
+vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t * a,
+                          locator_set_t * ls, u32 * ls_result)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_t *loc = NULL, *itloc = NULL;
+  uword _p = (u32) ~ 0, *p = &_p;
+  u32 loc_index = ~0, ls_index = ~0, *locit = NULL, **ls_indexes = NULL;
+  u32 loc_id = ~0;
+  int ret = 0;
+
+  ASSERT (a != NULL);
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  p = get_locator_set_index (a, p);
+  if (!p)
+    {
+      clib_warning ("locator-set %v doesn't exist", a->name);
+      return VNET_API_ERROR_INVALID_ARGUMENT;
+    }
+
+  if (ls == 0)
+    {
+      ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
+      if (!ls)
+       {
+         clib_warning ("locator-set %d to be overwritten doesn't exist!",
+                       p[0]);
+         return VNET_API_ERROR_INVALID_ARGUMENT;
+       }
+    }
+
+  if (a->is_add)
+    {
+      if (ls_result)
+       ls_result[0] = p[0];
+
+      /* allocate locators */
+      vec_foreach (itloc, a->locators)
+      {
+       ret = is_locator_in_locator_set (lcm, ls, itloc);
+       if (0 != ret)
+         {
+           return ret;
+         }
+
+       pool_get (lcm->locator_pool, loc);
+       loc[0] = itloc[0];
+       loc_index = loc - lcm->locator_pool;
+
+       vec_add1 (ls->locator_indices, loc_index);
+
+       vec_validate (lcm->locator_to_locator_sets, loc_index);
+       ls_indexes = vec_elt_at_index (lcm->locator_to_locator_sets,
+                                      loc_index);
+       vec_add1 (ls_indexes[0], p[0]);
+      }
+    }
+  else
+    {
+      ls_index = p[0];
+
+      itloc = a->locators;
+      loc_id = 0;
+      vec_foreach (locit, ls->locator_indices)
+      {
+       loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
+
+       if (loc->local && loc->sw_if_index == itloc->sw_if_index)
+         {
+           remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
+         }
+       if (0 == loc->local &&
+           !gid_address_cmp (&loc->address, &itloc->address))
+         {
+           remove_locator_from_locator_set (ls, locit, ls_index, loc_id);
+         }
+
+       loc_id++;
+      }
     }
+
+  return 0;
 }
+
 int
 vnet_lisp_add_del_locator_set (vnet_lisp_add_del_locator_set_args_t * a,
-                               u32 * ls_result)
+                              u32 * ls_result)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  locator_set_t * ls;
-  locator_t * loc, * itloc;
-  uword _p = (u32)~0, * p = &_p;
-  u32 loc_index, ls_index, ** ls_indexes;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *ls;
+  uword _p = (u32) ~ 0, *p = &_p;
+  u32 ls_index;
   u32 **eid_indexes;
+  int ret = 0;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
 
   if (a->is_add)
     {
-      /* check if overwrite */
-      if (a->local)
-        p = hash_get_mem(lcm->locator_set_index_by_name, a->name);
-      else
-        *p = a->index;
+      p = get_locator_set_index (a, p);
 
       /* overwrite */
-      if (p && p[0] != (u32)~0)
-        {
-          ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
-          if (!ls)
-            {
-              clib_warning("locator-set %d to be overwritten doesn't exist!",
-                           p[0]);
-              return -1;
-            }
-
-          /* clean locator to locator-set vectors and remove locators if
-           * they're not part of another locator-set */
-          clean_locator_to_locator_set (lcm, p[0]);
-
-          /* remove locator indices from locator set */
-          vec_free(ls->locator_indices);
-
-          ls_index = p[0];
-
-          if (ls_result)
-            ls_result[0] = p[0];
-        }
+      if (p && p[0] != (u32) ~ 0)
+       {
+         ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
+         if (!ls)
+           {
+             clib_warning ("locator-set %d to be overwritten doesn't exist!",
+                           p[0]);
+             return -1;
+           }
+
+         /* clean locator to locator-set vectors and remove locators if
+          * they're not part of another locator-set */
+         clean_locator_to_locator_set (lcm, p[0]);
+
+         /* remove locator indices from locator set */
+         vec_free (ls->locator_indices);
+
+         ls_index = p[0];
+
+         if (ls_result)
+           ls_result[0] = p[0];
+       }
       /* new locator-set */
       else
-        {
-          pool_get(lcm->locator_set_pool, ls);
-          ls_index = ls - lcm->locator_set_pool;
-
-          if (a->local)
-            {
-              ls->name = vec_dup(a->name);
-
-              if (!lcm->locator_set_index_by_name)
-                lcm->locator_set_index_by_name = hash_create_vec(
-                    /* size */0, sizeof(ls->name[0]), sizeof(uword));
-              hash_set_mem(lcm->locator_set_index_by_name, ls->name, ls_index);
-
-              /* mark as local locator-set */
-              vec_add1(lcm->local_locator_set_indexes, ls_index);
-            }
-          ls->local = a->local;
-          if (ls_result)
-            ls_result[0] = ls_index;
-        }
-
-      /* allocate locators */
-      vec_foreach (itloc, a->locators)
-        {
-          pool_get(lcm->locator_pool, loc);
-          loc[0] = itloc[0];
-          loc_index = loc - lcm->locator_pool;
-
-          vec_add1(ls->locator_indices, loc_index);
-
-          vec_validate (lcm->locator_to_locator_sets, loc_index);
-          ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
-                                        loc_index);
-          vec_add1(ls_indexes[0], ls_index);
-        }
+       {
+         pool_get (lcm->locator_set_pool, ls);
+         memset (ls, 0, sizeof (*ls));
+         ls_index = ls - lcm->locator_set_pool;
+
+         if (a->local)
+           {
+             ls->name = vec_dup (a->name);
+
+             if (!lcm->locator_set_index_by_name)
+               lcm->locator_set_index_by_name = hash_create_vec (
+                                                                  /* size */
+                                                                  0,
+                                                                  sizeof
+                                                                  (ls->name
+                                                                   [0]),
+                                                                  sizeof
+                                                                  (uword));
+             hash_set_mem (lcm->locator_set_index_by_name, ls->name,
+                           ls_index);
+
+             /* mark as local locator-set */
+             vec_add1 (lcm->local_locator_set_indexes, ls_index);
+           }
+         ls->local = a->local;
+         if (ls_result)
+           ls_result[0] = ls_index;
+       }
+
+      ret = vnet_lisp_add_del_locator (a, ls, NULL);
+      if (0 != ret)
+       {
+         return ret;
+       }
     }
   else
     {
-      /* find locator-set */
-      if (a->local)
-        {
-          p = hash_get_mem(lcm->locator_set_index_by_name, a->name);
-          if (!p)
-            {
-              clib_warning("locator-set %v doesn't exists", a->name);
-              return -1;
-            }
-        }
-      else
-        *p = a->index;
-
-      ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
+      p = get_locator_set_index (a, p);
+      if (!p)
+       {
+         clib_warning ("locator-set %v doesn't exists", a->name);
+         return -1;
+       }
+
+      ls = pool_elt_at_index (lcm->locator_set_pool, p[0]);
       if (!ls)
-        {
-          clib_warning("locator-set with index %d doesn't exists", p[0]);
-          return -1;
-        }
-//      /* XXX what happens when a mapping is configured to use the loc-set ? */
-//      if (vec_len (vec_elt_at_index(lcm->locator_set_to_eids, p[0])) != 0)
-//        {
-//          clib_warning ("Can't delete a locator that supports a mapping!");
-//          return -1;
-//        }
-
-      if (vec_len(lcm->locator_set_to_eids) != 0)
-      {
-          eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids, p[0]);
-          if (vec_len(eid_indexes[0]) != 0)
-          {
-              clib_warning ("Can't delete a locator that supports a mapping!");
-              return -1;
-          }
-      }
+       {
+         clib_warning ("locator-set with index %d doesn't exists", p[0]);
+         return -1;
+       }
+
+      if (lcm->mreq_itr_rlocs == p[0])
+       {
+         clib_warning ("Can't delete the locator-set used to constrain "
+                       "the itr-rlocs in map-requests!");
+         return -1;
+       }
+
+      if (vec_len (lcm->locator_set_to_eids) != 0)
+       {
+         eid_indexes = vec_elt_at_index (lcm->locator_set_to_eids, p[0]);
+         if (vec_len (eid_indexes[0]) != 0)
+           {
+             clib_warning
+               ("Can't delete a locator that supports a mapping!");
+             return -1;
+           }
+       }
 
       /* clean locator to locator-sets data */
       clean_locator_to_locator_set (lcm, p[0]);
 
       if (ls->local)
-        {
-          u32 it, lsi;
-
-          vec_foreach_index(it, lcm->local_locator_set_indexes)
-          {
-            lsi = vec_elt(lcm->local_locator_set_indexes, it);
-            if (lsi == p[0])
-              {
-                vec_del1(lcm->local_locator_set_indexes, it);
-                break;
-              }
-          }
-          hash_unset_mem(lcm->locator_set_index_by_name, ls->name);
-          vec_free(ls->name);
-        }
-      pool_put(lcm->locator_set_pool, ls);
+       {
+         u32 it, lsi;
+
+         vec_foreach_index (it, lcm->local_locator_set_indexes)
+         {
+           lsi = vec_elt (lcm->local_locator_set_indexes, it);
+           if (lsi == p[0])
+             {
+               vec_del1 (lcm->local_locator_set_indexes, it);
+               break;
+             }
+         }
+         hash_unset_mem (lcm->locator_set_index_by_name, ls->name);
+       }
+      vec_free (ls->name);
+      vec_free (ls->locator_indices);
+      pool_put (lcm->locator_set_pool, ls);
     }
   return 0;
 }
 
-static inline
-uword *vnet_lisp_get_locator(vnet_lisp_add_del_locator_set_args_t * a,
-                             uword *p)
+clib_error_t *
+vnet_lisp_enable_disable (u8 is_enable)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-
-  ASSERT(a != NULL);
-  ASSERT(p != NULL);
+  u32 vni, dp_table;
+  clib_error_t *error = 0;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  vnet_lisp_gpe_enable_disable_args_t _a, *a = &_a;
+
+  a->is_en = is_enable;
+  error = vnet_lisp_gpe_enable_disable (a);
+  if (error)
+    {
+      return clib_error_return (0, "failed to %s data-plane!",
+                               a->is_en ? "enable" : "disable");
+    }
 
-  /* find locator-set */
-  if (a->local)
-  {
-      p = hash_get_mem(lcm->locator_set_index_by_name, a->name);
-  }
+  if (is_enable)
+    {
+      /* enable all l2 and l3 ifaces */
+
+      /* *INDENT-OFF* */
+      hash_foreach(vni, dp_table, lcm->table_id_by_vni, ({
+        dp_add_del_iface(lcm, vni, 0, 1);
+      }));
+      hash_foreach(vni, dp_table, lcm->bd_id_by_vni, ({
+        dp_add_del_iface(lcm, vni, /* is_l2 */ 1, 1);
+      }));
+      /* *INDENT-ON* */
+    }
   else
-  {
-      *p = a->index;
-  }
+    {
+      /* clear interface table */
+      hash_free (lcm->fwd_entry_by_mapping_index);
+      pool_free (lcm->fwd_entry_pool);
+    }
 
-  return p;
+  /* update global flag */
+  lcm->is_enabled = is_enable;
+
+  return 0;
 }
 
-int
-vnet_lisp_add_del_locator_set_name (vnet_lisp_add_del_locator_set_args_t * a,
-                                    u32 * ls_result)
+static clib_error_t *
+lisp_enable_disable_command_fn (vlib_main_t * vm, unformat_input_t * input,
+                               vlib_cli_command_t * cmd)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  locator_set_t * ls;
-  uword _p = (u32)~0, * p = &_p;
-  u32 ls_index = ~0;
-  u32 **eid_indexes = NULL;
-
-  ASSERT(a != NULL);
-  ASSERT(ls_result != NULL);
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_enabled = 0;
+  u8 is_set = 0;
 
-  p = vnet_lisp_get_locator(a, p);
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
 
-  if (a->is_add)
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-      /* overwrite */
-      if (p && p[0] != (u32)~0)
-        {
-          ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
-          if (!ls)
-            {
-              clib_warning("locator-set %d to be overwritten doesn't exist!",
-                           p[0]);
-              return VNET_API_ERROR_UNSPECIFIED;
-            }
-
-          /* clean locator to locator-set vectors and remove locators if
-           * they're not part of another locator-set */
-          clean_locator_to_locator_set (lcm, p[0]);
-
-          /* remove locator indices from locator set */
-          vec_free(ls->locator_indices);
-
-          ls_index = p[0];
-
-          if (ls_result)
-            ls_result[0] = p[0];
-        }
-      /* new locator-set */
+      if (unformat (line_input, "enable"))
+       {
+         is_set = 1;
+         is_enabled = 1;
+       }
+      else if (unformat (line_input, "disable"))
+       is_set = 1;
       else
-        {
-          pool_get(lcm->locator_set_pool, ls);
-          ls_index = ls - lcm->locator_set_pool;
-
-          if (a->local)
-            {
-              ls->name = vec_dup(a->name);
-
-              if (!lcm->locator_set_index_by_name)
-                lcm->locator_set_index_by_name = hash_create_vec(
-                    /* size */0, sizeof(ls->name[0]), sizeof(uword));
-              hash_set_mem(lcm->locator_set_index_by_name, ls->name, ls_index);
-
-              /* mark as local locator-set */
-              vec_add1(lcm->local_locator_set_indexes, ls_index);
-            }
-          ls->local = a->local;
-         ls->locator_indices = NULL;
-          if (ls_result)
-            ls_result[0] = ls_index;
-        }
+       {
+         return clib_error_return (0, "parse error: '%U'",
+                                   format_unformat_error, line_input);
+       }
     }
-  else
-    {
-       if (!p)
-       {
-           clib_warning("locator-set %v doesn't exists", a->name);
-           return VNET_API_ERROR_INVALID_ARGUMENT;
-       }
 
-       ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
-       if (!ls)
-       {
-           clib_warning("locator-set with index %d doesn't exists", p[0]);
-           return VNET_API_ERROR_INVALID_ARGUMENT;
-       }
+  if (!is_set)
+    return clib_error_return (0, "state not set");
 
-      if (vec_len(lcm->locator_set_to_eids) != 0)
-      {
-          eid_indexes = vec_elt_at_index(lcm->locator_set_to_eids, p[0]);
-          if (vec_len(eid_indexes[0]) != 0)
-          {
-              clib_warning ("Can't delete a locator that supports a mapping!");
-              return -1;
-          }
-      }
+  return vnet_lisp_enable_disable (is_enabled);
+}
 
-      /* clean locator to locator-sets data */
-      clean_locator_to_locator_set (lcm, p[0]);
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_enable_disable_command) = {
+    .path = "lisp",
+    .short_help = "lisp [enable|disable]",
+    .function = lisp_enable_disable_command_fn,
+};
+/* *INDENT-ON* */
 
-      if (ls->local)
-        {
-          u32 it, lsi;
-
-          vec_foreach_index(it, lcm->local_locator_set_indexes)
-            {
-              lsi = vec_elt(lcm->local_locator_set_indexes, it);
-              if (lsi == p[0])
-                {
-                  vec_del1(lcm->local_locator_set_indexes, it);
-                  break;
-                }
-            }
-          hash_unset_mem(lcm->locator_set_index_by_name, ls->name);
-          vec_free(ls->name);
-        }
-      pool_put(lcm->locator_set_pool, ls);
-    }
-  return 0;
+u8
+vnet_lisp_enable_disable_status (void)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return lcm->is_enabled;
 }
 
-int
-vnet_lisp_add_del_locator (vnet_lisp_add_del_locator_set_args_t *a,
-                           u32 *ls_result)
+static u8 *
+format_lisp_status (u8 * s, va_list * args)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  locator_set_t *ls = NULL;
-  locator_t *loc = NULL, *itloc = NULL;
-  uword _p = (u32)~0, * p = &_p;
-  u32 loc_index = ~0, ls_index = ~0, *locit = NULL, **ls_indexes = NULL;
-  u32 i = ~0;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  return format (s, "%s", lcm->is_enabled ? "enabled" : "disabled");
+}
 
-  ASSERT(a != NULL);
-  ASSERT(ls_result != NULL);
+static clib_error_t *
+lisp_show_status_command_fn (vlib_main_t * vm, unformat_input_t * input,
+                            vlib_cli_command_t * cmd)
+{
+  u8 *msg = 0;
+  msg = format (msg, "feature: %U\ngpe: %U\n",
+               format_lisp_status, format_vnet_lisp_gpe_status);
+  vlib_cli_output (vm, "%v", msg);
+  vec_free (msg);
+  return 0;
+}
 
-  p = vnet_lisp_get_locator(a, p);
-  if (!p) {
-      clib_warning("locator-set %v doesn't exists", a->name);
-      return VNET_API_ERROR_INVALID_ARGUMENT;
-  }
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_status_command) = {
+    .path = "show lisp status",
+    .short_help = "show lisp status",
+    .function = lisp_show_status_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_show_eid_table_map_command_fn (vlib_main_t * vm,
+                                   unformat_input_t * input,
+                                   vlib_cli_command_t * cmd)
+{
+  hash_pair_t *p;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *vni_table = 0;
+  u8 is_l2 = 0;
 
-  ls_index = p[0];
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
 
-  if (a->is_add)
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
-        ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
-        if (!ls)
-        {
-            clib_warning("locator-set %d to be overwritten doesn't exist!",
-                         p[0]);
-            return VNET_API_ERROR_INVALID_ARGUMENT;
-        }
-
-        if (ls_result)
-            ls_result[0] = p[0];
+      if (unformat (line_input, "l2"))
+       {
+         vni_table = lcm->bd_id_by_vni;
+         is_l2 = 1;
+       }
+      else if (unformat (line_input, "l3"))
+       {
+         vni_table = lcm->table_id_by_vni;
+         is_l2 = 0;
+       }
+      else
+       return clib_error_return (0, "parse error: '%U'",
+                                 format_unformat_error, line_input);
+    }
 
-      /* allocate locators */
-      itloc = a->locators;
-      pool_get(lcm->locator_pool, loc);
-      loc[0] = itloc[0];
-      loc_index = loc - lcm->locator_pool;
+  if (!vni_table)
+    {
+      vlib_cli_output (vm, "Error: expected l2|l3 param!\n");
+      return 0;
+    }
 
-      vec_add1(ls->locator_indices, loc_index);
+  vlib_cli_output (vm, "%=10s%=10s", "VNI", is_l2 ? "BD" : "VRF");
 
-      vec_validate (lcm->locator_to_locator_sets, loc_index);
-      ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
-                                    loc_index);
-      vec_add1(ls_indexes[0], ls_index);
-    }
-  else
-    {
-      ls = pool_elt_at_index(lcm->locator_set_pool, p[0]);
-      if (!ls)
-        {
-          clib_warning("locator-set with index %d doesn't exists", p[0]);
-          return VNET_API_ERROR_INVALID_ARGUMENT;
-        }
+  /* *INDENT-OFF* */
+  hash_foreach_pair (p, vni_table,
+  ({
+    vlib_cli_output (vm, "%=10d%=10d", p->key, p->value[0]);
+  }));
+  /* *INDENT-ON* */
 
-      if (ls->local)
-      {
-          itloc = a->locators;
-          i = 0;
-          vec_foreach (locit, ls->locator_indices)
-          {
-              loc = pool_elt_at_index(lcm->locator_pool, locit[0]);
-              if (loc->local && loc->sw_if_index == itloc->sw_if_index)
-              {
-                  ls_indexes = vec_elt_at_index(lcm->locator_to_locator_sets,
-                                                locit[0]);
-                  pool_put_index(lcm->locator_pool, locit[0]);
-                  vec_del1(ls->locator_indices, i);
-                  vec_del1(ls_indexes[0], ls_index);
-              }
-              i++;
-          }
-      }
-    }
   return 0;
 }
 
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_eid_table_map_command) = {
+    .path = "show lisp eid-table map",
+    .short_help = "show lisp eid-table l2|l3",
+    .function = lisp_show_eid_table_map_command_fn,
+};
+/* *INDENT-ON* */
+
 static clib_error_t *
-lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input,
-                                     vlib_cli_command_t * cmd)
+lisp_add_del_locator_set_command_fn (vlib_main_t * vm,
+                                    unformat_input_t * input,
+                                    vlib_cli_command_t * cmd)
 {
-  lisp_gpe_main_t * lgm = &lisp_gpe_main;
-  vnet_main_t * vnm = lgm->vnet_main;
-  unformat_input_t _line_input, * line_input = &_line_input;
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  vnet_main_t *vnm = lgm->vnet_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
   u8 is_add = 1;
-  clib_error_t * error = 0;
-  u8 * locator_set_name = 0;
-  locator_t locator, * locators = 0;
-  vnet_lisp_add_del_locator_set_args_t _a, * a = &_a;
+  clib_error_t *error = 0;
+  u8 *locator_set_name = 0;
+  locator_t locator, *locators = 0;
+  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
   u32 ls_index = 0;
+  int rv = 0;
 
-  memset(&locator, 0, sizeof(locator));
-  memset(a, 0, sizeof(a[0]));
+  memset (&locator, 0, sizeof (locator));
+  memset (a, 0, sizeof (a[0]));
 
   /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
+  if (!unformat_user (input, unformat_line_input, line_input))
     return 0;
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (line_input, "add %_%v%_", &locator_set_name))
-        is_add = 1;
+       is_add = 1;
       else if (unformat (line_input, "del %_%v%_", &locator_set_name))
-        is_add = 0;
+       is_add = 0;
       else if (unformat (line_input, "iface %U p %d w %d",
-                         unformat_vnet_sw_interface, vnm, &locator.sw_if_index,
-                         &locator.priority, &locator.weight))
-        {
-          locator.local = 1;
-          vec_add1(locators, locator);
-        }
+                        unformat_vnet_sw_interface, vnm,
+                        &locator.sw_if_index, &locator.priority,
+                        &locator.weight))
+       {
+         locator.local = 1;
+         vec_add1 (locators, locator);
+       }
       else
-        {
-          error = unformat_parse_error(line_input);
-          goto done;
-        }
+       {
+         error = unformat_parse_error (line_input);
+         goto done;
+       }
     }
 
   a->name = locator_set_name;
@@ -640,142 +2303,402 @@ lisp_add_del_locator_set_command_fn (vlib_main_t * vm, unformat_input_t * input,
   a->is_add = is_add;
   a->local = 1;
 
-  vnet_lisp_add_del_locator_set(a, &ls_index);
+  rv = vnet_lisp_add_del_locator_set (a, &ls_index);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s locator-set!",
+                                is_add ? "add" : "delete");
+    }
 
- done:
-  vec_free(locators);
-  vec_free(locator_set_name);
+done:
+  vec_free (locators);
+  if (locator_set_name)
+    vec_free (locator_set_name);
   return error;
 }
 
+/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (lisp_cp_add_del_locator_set_command) = {
     .path = "lisp locator-set",
-    .short_help = "lisp locator-set add/del <name> <iface-name> <priority> <weight>",
+    .short_help = "lisp locator-set add/del <name> [iface <iface-name> "
+        "p <priority> w <weight>]",
     .function = lisp_add_del_locator_set_command_fn,
 };
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_add_del_locator_in_set_command_fn (vlib_main_t * vm,
+                                       unformat_input_t * input,
+                                       vlib_cli_command_t * cmd)
+{
+  lisp_gpe_main_t *lgm = &lisp_gpe_main;
+  vnet_main_t *vnm = lgm->vnet_main;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  clib_error_t *error = 0;
+  u8 *locator_set_name = 0;
+  u8 locator_set_name_set = 0;
+  locator_t locator, *locators = 0;
+  vnet_lisp_add_del_locator_set_args_t _a, *a = &_a;
+  u32 ls_index = 0;
+
+  memset (&locator, 0, sizeof (locator));
+  memset (a, 0, sizeof (a[0]));
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "add"))
+       is_add = 1;
+      else if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "locator-set %_%v%_", &locator_set_name))
+       locator_set_name_set = 1;
+      else if (unformat (line_input, "iface %U p %d w %d",
+                        unformat_vnet_sw_interface, vnm,
+                        &locator.sw_if_index, &locator.priority,
+                        &locator.weight))
+       {
+         locator.local = 1;
+         vec_add1 (locators, locator);
+       }
+      else
+       {
+         error = unformat_parse_error (line_input);
+         goto done;
+       }
+    }
+
+  if (!locator_set_name_set)
+    {
+      error = clib_error_return (0, "locator_set name not set!");
+      goto done;
+    }
+
+  a->name = locator_set_name;
+  a->locators = locators;
+  a->is_add = is_add;
+  a->local = 1;
+
+  vnet_lisp_add_del_locator (a, 0, &ls_index);
+
+done:
+  vec_free (locators);
+  vec_free (locator_set_name);
+  return error;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_cp_add_del_locator_in_set_command) = {
+    .path = "lisp locator",
+    .short_help = "lisp locator add/del locator-set <name> iface <iface-name> "
+                  "p <priority> w <weight>",
+    .function = lisp_add_del_locator_in_set_command_fn,
+};
+/* *INDENT-ON* */
 
 static clib_error_t *
 lisp_cp_show_locator_sets_command_fn (vlib_main_t * vm,
-                                      unformat_input_t * input,
-                                      vlib_cli_command_t * cmd)
+                                     unformat_input_t * input,
+                                     vlib_cli_command_t * cmd)
 {
-  locator_set_t * lsit;
-  locator_t * loc;
-  u32 * locit;
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+  locator_set_t *lsit;
+  locator_t *loc;
+  u32 *locit;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
 
-  vlib_cli_output (vm, "%=20s%=16s%=16s%=16s", "Locator-set", "Locator",
-                   "Priority", "Weight");
+  vlib_cli_output (vm, "%s%=16s%=16s%=16s", "Locator-set", "Locator",
+                  "Priority", "Weight");
+
+  /* *INDENT-OFF* */
   pool_foreach (lsit, lcm->locator_set_pool,
   ({
     u8 * msg = 0;
-    msg = format (msg, "%-16v", lsit->name);
+    int next_line = 0;
+    if (lsit->local)
+      {
+        msg = format (msg, "%v", lsit->name);
+      }
+    else
+      {
+        msg = format (msg, "<%s-%d>", "remote", lsit - lcm->locator_set_pool);
+      }
     vec_foreach (locit, lsit->locator_indices)
       {
+        if (next_line)
+          {
+            msg = format (msg, "%16s", " ");
+          }
         loc = pool_elt_at_index (lcm->locator_pool, locit[0]);
         if (loc->local)
-          msg = format (msg, "%16d%16d%16d", loc->sw_if_index, loc->priority,
+          msg = format (msg, "%16d%16d%16d\n", loc->sw_if_index, loc->priority,
                         loc->weight);
         else
-          msg = format (msg, "%16U%16d%16d", format_gid_address, &loc->address,
-                        loc->priority, loc->weight);
+          msg = format (msg, "%16U%16d%16d\n", format_ip_address,
+                        &gid_address_ip(&loc->address), loc->priority,
+                        loc->weight);
+        next_line = 1;
       }
     vlib_cli_output (vm, "%v", msg);
     vec_free (msg);
   }));
+  /* *INDENT-ON* */
   return 0;
 }
 
+/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (lisp_cp_show_locator_sets_command) = {
     .path = "show lisp locator-set",
     .short_help = "Shows locator-sets",
     .function = lisp_cp_show_locator_sets_command_fn,
 };
+/* *INDENT-ON* */
+
+static map_resolver_t *
+get_map_resolver (ip_address_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  map_resolver_t *mr;
+
+  vec_foreach (mr, lcm->map_resolvers)
+  {
+    if (!ip_address_cmp (&mr->address, a))
+      {
+       return mr;
+      }
+  }
+  return 0;
+}
 
 int
 vnet_lisp_add_del_map_resolver (vnet_lisp_add_del_map_resolver_args_t * a)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  ip_address_t * addr;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
   u32 i;
+  map_resolver_t _mr, *mr = &_mr;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
 
   if (a->is_add)
     {
-      vec_foreach(addr, lcm->map_resolvers)
-        {
-          if (!ip_address_cmp (addr, &a->address))
-            {
-              clib_warning("map-resolver %U already exists!", format_ip_address,
-                           &a->address);
-              return -1;
-            }
-        }
-      vec_add1(lcm->map_resolvers, a->address);
+
+      if (get_map_resolver (&a->address))
+       {
+         clib_warning ("map-resolver %U already exists!", format_ip_address,
+                       &a->address);
+         return -1;
+       }
+
+      memset (mr, 0, sizeof (*mr));
+      ip_address_copy (&mr->address, &a->address);
+      vec_add1 (lcm->map_resolvers, *mr);
+
+      if (vec_len (lcm->map_resolvers) == 1)
+       lcm->do_map_resolver_election = 1;
     }
   else
     {
-      for (i = 0; i < vec_len(lcm->map_resolvers); i++)
-        {
-          addr = vec_elt_at_index(lcm->map_resolvers, i);
-          if (!ip_address_cmp (addr, &a->address))
-            {
-              vec_delete(lcm->map_resolvers, 1, i);
-              break;
-            }
-        }
+      for (i = 0; i < vec_len (lcm->map_resolvers); i++)
+       {
+         mr = vec_elt_at_index (lcm->map_resolvers, i);
+         if (!ip_address_cmp (&mr->address, &a->address))
+           {
+             if (!ip_address_cmp (&mr->address, &lcm->active_map_resolver))
+               lcm->do_map_resolver_election = 1;
+
+             vec_del1 (lcm->map_resolvers, i);
+             break;
+           }
+       }
     }
   return 0;
 }
 
 static clib_error_t *
 lisp_add_del_map_resolver_command_fn (vlib_main_t * vm,
-                                         unformat_input_t * input,
-                                         vlib_cli_command_t * cmd)
+                                     unformat_input_t * input,
+                                     vlib_cli_command_t * cmd)
 {
-  unformat_input_t _line_input, * line_input = &_line_input;
-  u8 is_add = 1;
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1, addr_set = 0;
   ip_address_t ip_addr;
-  clib_error_t * error = 0;
-  vnet_lisp_add_del_map_resolver_args_t _a, * a = &_a;
+  clib_error_t *error = 0;
+  int rv = 0;
+  vnet_lisp_add_del_map_resolver_args_t _a, *a = &_a;
 
   /* Get a line of input. */
-  if (! unformat_user (input, unformat_line_input, line_input))
+  if (!unformat_user (input, unformat_line_input, line_input))
     return 0;
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
       if (unformat (line_input, "add"))
-        is_add = 1;
+       is_add = 1;
       else if (unformat (line_input, "del"))
-        is_add = 0;
+       is_add = 0;
       else if (unformat (line_input, "%U", unformat_ip_address, &ip_addr))
-        ;
+       addr_set = 1;
       else
-        {
-          error = unformat_parse_error(line_input);
-          goto done;
-        }
+       {
+         error = unformat_parse_error (line_input);
+         goto done;
+       }
+    }
+
+  if (!addr_set)
+    {
+      error = clib_error_return (0, "Map-resolver address must be set!");
+      goto done;
     }
+
   a->is_add = is_add;
   a->address = ip_addr;
-  vnet_lisp_add_del_map_resolver (a);
+  rv = vnet_lisp_add_del_map_resolver (a);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s map-resolver!",
+                                is_add ? "add" : "delete");
+    }
 
- done:
+done:
   return error;
 }
 
+/* *INDENT-OFF* */
 VLIB_CLI_COMMAND (lisp_add_del_map_resolver_command) = {
     .path = "lisp map-resolver",
     .short_help = "lisp map-resolver add/del <ip_address>",
     .function = lisp_add_del_map_resolver_command_fn,
 };
+/* *INDENT-ON* */
+
+int
+vnet_lisp_add_del_mreq_itr_rlocs (vnet_lisp_add_del_mreq_itr_rloc_args_t * a)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  uword *p = 0;
+
+  if (vnet_lisp_enable_disable_status () == 0)
+    {
+      clib_warning ("LISP is disabled!");
+      return VNET_API_ERROR_LISP_DISABLED;
+    }
+
+  if (a->is_add)
+    {
+      p = hash_get_mem (lcm->locator_set_index_by_name, a->locator_set_name);
+      if (!p)
+       {
+         clib_warning ("locator-set %v doesn't exist", a->locator_set_name);
+         return VNET_API_ERROR_INVALID_ARGUMENT;
+       }
+
+      lcm->mreq_itr_rlocs = p[0];
+    }
+  else
+    {
+      lcm->mreq_itr_rlocs = ~0;
+    }
+
+  return 0;
+}
+
+static clib_error_t *
+lisp_add_del_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
+                                       unformat_input_t * input,
+                                       vlib_cli_command_t * cmd)
+{
+  unformat_input_t _line_input, *line_input = &_line_input;
+  u8 is_add = 1;
+  u8 *locator_set_name = 0;
+  clib_error_t *error = 0;
+  int rv = 0;
+  vnet_lisp_add_del_mreq_itr_rloc_args_t _a, *a = &_a;
+
+  /* Get a line of input. */
+  if (!unformat_user (input, unformat_line_input, line_input))
+    return 0;
+
+  while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (line_input, "del"))
+       is_add = 0;
+      else if (unformat (line_input, "add %_%v%_", &locator_set_name))
+       is_add = 1;
+      else
+       {
+         error = unformat_parse_error (line_input);
+         goto done;
+       }
+    }
+
+  a->is_add = is_add;
+  a->locator_set_name = locator_set_name;
+  rv = vnet_lisp_add_del_mreq_itr_rlocs (a);
+  if (0 != rv)
+    {
+      error = clib_error_return (0, "failed to %s map-request itr-rlocs!",
+                                is_add ? "add" : "delete");
+    }
+
+  vec_free (locator_set_name);
+
+done:
+  return error;
+
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_add_del_map_request_command) = {
+    .path = "lisp map-request itr-rlocs",
+    .short_help = "lisp map-request itr-rlocs add/del <locator_set_name>",
+    .function = lisp_add_del_mreq_itr_rlocs_command_fn,
+};
+/* *INDENT-ON* */
+
+static clib_error_t *
+lisp_show_mreq_itr_rlocs_command_fn (vlib_main_t * vm,
+                                    unformat_input_t * input,
+                                    vlib_cli_command_t * cmd)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  locator_set_t *loc_set;
+
+  vlib_cli_output (vm, "%=20s", "itr-rlocs");
+
+  if (~0 == lcm->mreq_itr_rlocs)
+    {
+      return 0;
+    }
+
+  loc_set = pool_elt_at_index (lcm->locator_set_pool, lcm->mreq_itr_rlocs);
+
+  vlib_cli_output (vm, "%=20s", loc_set->name);
+
+  return 0;
+}
+
+/* *INDENT-OFF* */
+VLIB_CLI_COMMAND (lisp_show_map_request_command) = {
+    .path = "show lisp map-request itr-rlocs",
+    .short_help = "Shows map-request itr-rlocs",
+    .function = lisp_show_mreq_itr_rlocs_command_fn,
+};
+/* *INDENT-ON* */
 
 /* Statistics (not really errors) */
 #define foreach_lisp_cp_lookup_error           \
 _(DROP, "drop")                                \
 _(MAP_REQUESTS_SENT, "map-request sent")
 
-static char * lisp_cp_lookup_error_strings[] = {
+static char *lisp_cp_lookup_error_strings[] = {
 #define _(sym,string) string,
   foreach_lisp_cp_lookup_error
 #undef _
@@ -784,7 +2707,7 @@ static char * lisp_cp_lookup_error_strings[] = {
 typedef enum
 {
 #define _(sym,str) LISP_CP_LOOKUP_ERROR_##sym,
-    foreach_lisp_cp_lookup_error
+  foreach_lisp_cp_lookup_error
 #undef _
     LISP_CP_LOOKUP_N_ERROR,
 } lisp_cp_lookup_error_t;
@@ -792,15 +2715,13 @@ typedef enum
 typedef enum
 {
   LISP_CP_LOOKUP_NEXT_DROP,
-  LISP_CP_LOOKUP_NEXT_IP4_LOOKUP,
-  LISP_CP_LOOKUP_NEXT_IP6_LOOKUP,
   LISP_CP_LOOKUP_N_NEXT,
 } lisp_cp_lookup_next_t;
 
 typedef struct
 {
   gid_address_t dst_eid;
-  ip4_address_t map_resolver_ip;
+  ip_address_t map_resolver_ip;
 } lisp_cp_lookup_trace_t;
 
 u8 *
@@ -808,153 +2729,105 @@ format_lisp_cp_lookup_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  lisp_cp_lookup_trace_t * t = va_arg (*args, lisp_cp_lookup_trace_t *);
+  lisp_cp_lookup_trace_t *t = va_arg (*args, lisp_cp_lookup_trace_t *);
 
   s = format (s, "LISP-CP-LOOKUP: map-resolver: %U destination eid %U",
-              format_ip4_address, &t->map_resolver_ip, format_gid_address,
-              &t->dst_eid);
+             format_ip_address, &t->map_resolver_ip, format_gid_address,
+             &t->dst_eid);
   return s;
 }
 
-static u32
-ip_fib_lookup_with_table (lisp_cp_main_t * lcm, u32 fib_index,
-                          ip_address_t * dst)
+int
+get_mr_and_local_iface_ip (lisp_cp_main_t * lcm, ip_address_t * mr_ip,
+                          ip_address_t * sloc)
 {
-  if (ip_addr_version (dst) == IP4)
-      return ip4_fib_lookup_with_table (lcm->im4, fib_index, &ip_addr_v4(dst),
-                                        0);
-  else
-      return ip6_fib_lookup_with_table (lcm->im6, fib_index, &ip_addr_v6(dst));
-}
+  map_resolver_t *mrit;
+  ip_address_t *a;
 
-void
-get_local_iface_ip_for_dst (lisp_cp_main_t *lcm, ip_address_t * dst,
-                            ip_address_t * sloc)
-{
-  u32 adj_index;
-  ip_adjacency_t * adj;
-  ip_interface_address_t * ia = 0;
-  ip_lookup_main_t * lm = &lcm->im4->lookup_main;
-  ip4_address_t * l4 = 0;
-  ip6_address_t * l6 = 0;
-
-  adj_index = ip_fib_lookup_with_table (lcm, 0, dst);
-  adj = ip_get_adjacency (lm, adj_index);
-
-  if (adj->lookup_next_index == IP_LOOKUP_NEXT_ARP)
-    {
-      ia = pool_elt_at_index(lm->if_address_pool, adj->if_address_index);
-      if (ip_addr_version(dst) == IP4)
-        {
-          l4 = ip_interface_address_get_address (lm, ia);
-        }
-      else
-        {
-          l6 = ip_interface_address_get_address (lm, ia);
-        }
-    }
-  else if (adj->lookup_next_index == IP_LOOKUP_NEXT_REWRITE)
-    {
-      /* find sw_if_index in rewrite header */
-      u32 sw_if_index = adj->rewrite_header.sw_if_index;
-
-      /* find suitable address */
-      if (ip_addr_version(dst) == IP4)
-        {
-          /* find the first ip address */
-          foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
-                                        sw_if_index, 1 /* unnumbered */,
-          ({
-            l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
-            break;
-          }));
-        }
-      else
-        {
-          /* find the first ip address */
-          foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
-                                        sw_if_index, 1 /* unnumbered */,
-          ({
-            l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
-            break;
-          }));
-        }
-    }
-  else
+  if (vec_len (lcm->map_resolvers) == 0)
     {
-      clib_warning("Can't find local local interface ip for dst %U",
-                   format_ip_address, dst);
-      return;
+      clib_warning ("No map-resolver configured");
+      return 0;
     }
 
-  if (l4)
-    {
-      ip_addr_v4(sloc).as_u32 = l4->as_u32;
-      ip_addr_version(sloc) = IP4;
-    }
-  else if (l6)
-    {
-      memcpy (&ip_addr_v6(sloc), l6, sizeof(*l6));
-      ip_addr_version(sloc) = IP6;
-    }
-  else
-    {
-      clib_warning("Can't find local interface addr for dst %U",
-                   format_ip_address, dst);
-    }
-}
+  /* find the first mr ip we have a route to and the ip of the
+   * iface that has a route to it */
+  vec_foreach (mrit, lcm->map_resolvers)
+  {
+    a = &mrit->address;
+    if (0 != ip_fib_get_first_egress_ip_for_dst (lcm, a, sloc))
+      {
+       ip_address_copy (mr_ip, a);
+
+       /* also update globals */
+       return 1;
+      }
+  }
 
+  clib_warning ("Can't find map-resolver and local interface ip!");
+  return 0;
+}
 
-static ip_address_t *
+static gid_address_t *
 build_itr_rloc_list (lisp_cp_main_t * lcm, locator_set_t * loc_set)
 {
-  ip4_address_t * l4;
-  ip6_address_t * l6;
+  void *addr;
   u32 i;
-  locator_t * loc;
-  u32 * loc_indexp;
-  ip_interface_address_t * ia = 0;
-  ip_address_t * rlocs = 0;
-  ip_address_t _rloc, * rloc = &_rloc;
-
-  for (i = 0; i < vec_len(loc_set->locator_indices); i++)
+  locator_t *loc;
+  u32 *loc_indexp;
+  ip_interface_address_t *ia = 0;
+  gid_address_t gid_data, *gid = &gid_data;
+  gid_address_t *rlocs = 0;
+  ip_prefix_t *ippref = &gid_address_ippref (gid);
+  ip_address_t *rloc = &ip_prefix_addr (ippref);
+
+  memset (gid, 0, sizeof (gid[0]));
+  gid_address_type (gid) = GID_ADDR_IP_PREFIX;
+  for (i = 0; i < vec_len (loc_set->locator_indices); i++)
     {
-      loc_indexp = vec_elt_at_index(loc_set->locator_indices, i);
+      loc_indexp = vec_elt_at_index (loc_set->locator_indices, i);
       loc = pool_elt_at_index (lcm->locator_pool, loc_indexp[0]);
 
-      ip_addr_version(rloc) = IP4;
       /* Add ipv4 locators first TODO sort them */
+
+      /* *INDENT-OFF* */
       foreach_ip_interface_address (&lcm->im4->lookup_main, ia,
                                    loc->sw_if_index, 1 /* unnumbered */,
       ({
-       l4 = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
-  ip_addr_v4(rloc) = l4[0];
-  vec_add1(rlocs, rloc[0]);
+       addr = ip_interface_address_get_address (&lcm->im4->lookup_main, ia);
+       ip_address_set (rloc, addr, IP4);
+        ip_prefix_len (ippref) = 32;
+        ip_prefix_normalize (ippref);
+        vec_add1 (rlocs, gid[0]);
       }));
 
-      ip_addr_version(rloc) = IP6;
       /* Add ipv6 locators */
       foreach_ip_interface_address (&lcm->im6->lookup_main, ia,
                                    loc->sw_if_index, 1 /* unnumbered */,
       ({
-  l6 = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
-  ip_addr_v6(rloc) = l6[0];
-  vec_add1(rlocs, rloc[0]);
+        addr = ip_interface_address_get_address (&lcm->im6->lookup_main, ia);
+        ip_address_set (rloc, addr, IP6);
+        ip_prefix_len (ippref) = 128;
+        ip_prefix_normalize (ippref);
+        vec_add1 (rlocs, gid[0]);
       }));
+      /* *INDENT-ON* */
+
     }
   return rlocs;
 }
 
 static vlib_buffer_t *
-build_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm,
-                                gid_address_t * seid, gid_address_t * deid,
-                                locator_set_t * loc_set, u8 is_smr_invoked,
-                                u64 *nonce_res, u32 * bi_res)
+build_encapsulated_map_request (lisp_cp_main_t * lcm,
+                               gid_address_t * seid, gid_address_t * deid,
+                               locator_set_t * loc_set, ip_address_t * mr_ip,
+                               ip_address_t * sloc, u8 is_smr_invoked,
+                               u64 * nonce_res, u32 * bi_res)
 {
-  vlib_buffer_t * b;
+  vlib_buffer_t *b;
   u32 bi;
-  ip_address_t * mr_ip, sloc;
-  ip_address_t * rlocs = 0;
+  gid_address_t *rlocs = 0;
+  vlib_main_t *vm = lcm->vlib_main;
 
   if (vlib_buffer_alloc (vm, &bi, 1) != 1)
     {
@@ -970,118 +2843,334 @@ build_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm,
   /* get rlocs */
   rlocs = build_itr_rloc_list (lcm, loc_set);
 
-  /* put lisp msg */
-  lisp_msg_put_mreq (lcm, b, seid, deid, rlocs, is_smr_invoked, nonce_res);
+  if (MR_MODE_SRC_DST == lcm->map_request_mode)
+    {
+      gid_address_t sd;
+      memset (&sd, 0, sizeof (sd));
+      build_src_dst (&sd, seid, deid);
+      lisp_msg_put_mreq (lcm, b, seid, &sd, rlocs, is_smr_invoked, nonce_res);
+    }
+  else
+    {
+      /* put lisp msg */
+      lisp_msg_put_mreq (lcm, b, seid, deid, rlocs, is_smr_invoked,
+                        nonce_res);
+    }
 
   /* push ecm: udp-ip-lisp */
   lisp_msg_push_ecm (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, seid, deid);
 
-  /* get map-resolver ip XXX use first*/
-  mr_ip = vec_elt_at_index(lcm->map_resolvers, 0);
-
-  /* get local iface ip to use in map-request XXX fib 0 for now*/
-  get_local_iface_ip_for_dst (lcm, mr_ip, &sloc);
-
   /* push outer ip header */
-  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, &sloc,
-                       mr_ip);
+  pkt_push_udp_and_ip (vm, b, LISP_CONTROL_PORT, LISP_CONTROL_PORT, sloc,
+                      mr_ip);
 
   bi_res[0] = bi;
 
-  if (rlocs)
-    vec_free(rlocs);
+  vec_free (rlocs);
   return b;
 }
 
-static void
-send_encapsulated_map_request (vlib_main_t * vm, lisp_cp_main_t *lcm,
-                               gid_address_t * seid, gid_address_t * deid,
-                               u8 is_smr_invoked)
-{
-  u32 next_index, bi = 0, * to_next, map_index;
-  vlib_buffer_t * b;
-  vlib_frame_t * f;
-  u64 nonce = 0;
-  locator_set_t * loc_set;
-  mapping_t * map;
-  pending_map_request_t * pmr;
+static void
+reset_pending_mr_counters (pending_map_request_t * r)
+{
+  r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
+  r->retries_num = 0;
+}
+
+static int
+elect_map_resolver (lisp_cp_main_t * lcm)
+{
+  map_resolver_t *mr;
+
+  vec_foreach (mr, lcm->map_resolvers)
+  {
+    if (!mr->is_down)
+      {
+       ip_address_copy (&lcm->active_map_resolver, &mr->address);
+       lcm->do_map_resolver_election = 0;
+       return 1;
+      }
+  }
+  return 0;
+}
+
+#define send_encapsulated_map_request(lcm, seid, deid, smr) \
+  _send_encapsulated_map_request(lcm, seid, deid, smr, 0)
+
+#define resend_encapsulated_map_request(lcm, seid, deid, smr) \
+  _send_encapsulated_map_request(lcm, seid, deid, smr, 1)
+
+static int
+_send_encapsulated_map_request (lisp_cp_main_t * lcm,
+                               gid_address_t * seid, gid_address_t * deid,
+                               u8 is_smr_invoked, u8 is_resend)
+{
+  map_resolver_t *mr;
+  u32 next_index, bi = 0, *to_next, map_index;
+  vlib_buffer_t *b;
+  vlib_frame_t *f;
+  u64 nonce = 0;
+  locator_set_t *loc_set;
+  mapping_t *map;
+  pending_map_request_t *pmr, *duplicate_pmr = 0;
+  ip_address_t sloc;
+  u32 ls_index;
+
+  ASSERT (*lcm->pending_map_request_lock);
+
+  /* if there is already a pending request remember it */
+
+  /* *INDENT-OFF* */
+  pool_foreach(pmr, lcm->pending_map_requests_pool,
+  ({
+    if (!gid_address_cmp (&pmr->src, seid)
+        && !gid_address_cmp (&pmr->dst, deid))
+      {
+        duplicate_pmr = pmr;
+        break;
+      }
+  }));
+  /* *INDENT-ON* */
+
+  if (!is_resend && duplicate_pmr)
+    {
+      /* don't send the request if there is a pending map request already */
+      return 0;
+    }
 
   /* get locator-set for seid */
-  map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
-  if (map_index == ~0)
+  if (!lcm->lisp_pitr)
     {
-      clib_warning("No local mapping found in eid-table for %U!",
-                   format_gid_address, seid);
-      return;
+      map_index = gid_dictionary_lookup (&lcm->mapping_index_by_gid, seid);
+      if (map_index == ~0)
+       {
+         clib_warning ("No local mapping found in eid-table for %U!",
+                       format_gid_address, seid);
+         return -1;
+       }
+
+      map = pool_elt_at_index (lcm->mapping_pool, map_index);
+
+      if (!map->local)
+       {
+         clib_warning
+           ("Mapping found for src eid %U is not marked as local!",
+            format_gid_address, seid);
+         return -1;
+       }
+      ls_index = map->locator_set_index;
+    }
+  else
+    {
+      map_index = lcm->pitr_map_index;
+      map = pool_elt_at_index (lcm->mapping_pool, lcm->pitr_map_index);
+      ls_index = map->locator_set_index;
+    }
+
+  /* overwrite locator set if map-request itr-rlocs configured */
+  if (~0 != lcm->mreq_itr_rlocs)
+    {
+      ls_index = lcm->mreq_itr_rlocs;
     }
 
-  map = pool_elt_at_index (lcm->mapping_pool, map_index);
+  loc_set = pool_elt_at_index (lcm->locator_set_pool, ls_index);
 
-  if (!map->local)
+  while (lcm->do_map_resolver_election
+        | (0 == ip_fib_get_first_egress_ip_for_dst (lcm,
+                                                    &lcm->active_map_resolver,
+                                                    &sloc)))
     {
-      clib_warning("Mapping found for src eid %U is not marked as local!",
-                   format_gid_address, seid);
-      return;
+      if (0 == elect_map_resolver (lcm))
+       /* all Mrs are down */
+       {
+         if (duplicate_pmr)
+           duplicate_pmr->to_be_removed = 1;
+
+         /* restart MR checking by marking all of them up */
+         vec_foreach (mr, lcm->map_resolvers) mr->is_down = 0;
+
+         return -1;
+       }
     }
-  loc_set = pool_elt_at_index (lcm->locator_set_pool, map->locator_set_index);
 
   /* build the encapsulated map request */
-  b = build_encapsulated_map_request (vm, lcm, seid, deid, loc_set,
-                                      is_smr_invoked, &nonce, &bi);
+  b = build_encapsulated_map_request (lcm, seid, deid, loc_set,
+                                     &lcm->active_map_resolver,
+                                     &sloc, is_smr_invoked, &nonce, &bi);
 
   if (!b)
-    return;
+    return -1;
 
-  vnet_buffer(b)->sw_if_index[VLIB_TX] = ~0;
-  next_index = (ip_prefix_version(&gid_address_ippref(seid)) == IP4) ?
-      ip4_lookup_node.index : ip6_lookup_node.index;
+  /* set fib index to default and lookup node */
+  vnet_buffer (b)->sw_if_index[VLIB_TX] = 0;
+  next_index = (ip_addr_version (&lcm->active_map_resolver) == IP4) ?
+    ip4_lookup_node.index : ip6_lookup_node.index;
 
-  f = vlib_get_frame_to_node (vm, next_index);
+  f = vlib_get_frame_to_node (lcm->vlib_main, next_index);
 
   /* Enqueue the packet */
   to_next = vlib_frame_vector_args (f);
   to_next[0] = bi;
   f->n_vectors = 1;
-  vlib_put_frame_to_node (vm, next_index, f);
+  vlib_put_frame_to_node (lcm->vlib_main, next_index, f);
+
+  if (duplicate_pmr)
+    /* if there is a pending request already update it */
+    {
+      if (clib_fifo_elts (duplicate_pmr->nonces) >= PENDING_MREQ_QUEUE_LEN)
+       {
+         /* remove the oldest nonce */
+         u64 CLIB_UNUSED (tmp), *nonce_del;
+         nonce_del = clib_fifo_head (duplicate_pmr->nonces);
+         hash_unset (lcm->pending_map_requests_by_nonce, nonce_del[0]);
+         clib_fifo_sub1 (duplicate_pmr->nonces, tmp);
+       }
+
+      clib_fifo_add1 (duplicate_pmr->nonces, nonce);
+      hash_set (lcm->pending_map_requests_by_nonce, nonce,
+               duplicate_pmr - lcm->pending_map_requests_pool);
+    }
+  else
+    {
+      /* add map-request to pending requests table */
+      pool_get (lcm->pending_map_requests_pool, pmr);
+      memset (pmr, 0, sizeof (*pmr));
+      gid_address_copy (&pmr->src, seid);
+      gid_address_copy (&pmr->dst, deid);
+      clib_fifo_add1 (pmr->nonces, nonce);
+      pmr->is_smr_invoked = is_smr_invoked;
+      reset_pending_mr_counters (pmr);
+      hash_set (lcm->pending_map_requests_by_nonce, nonce,
+               pmr - lcm->pending_map_requests_pool);
+    }
 
-  /* add map-request to pending requests table */
-  pool_get(lcm->pending_map_requests_pool, pmr);
-  gid_address_copy (&pmr->src, seid);
-  gid_address_copy (&pmr->dst, deid);
-  pmr->src_mapping_index = map_index;
-  hash_set(lcm->pending_map_requests_by_nonce, nonce,
-           pmr - lcm->pending_map_requests_pool);
+  return 0;
 }
 
 static void
-get_src_and_dst (void *hdr, ip_address_t * src, ip_address_t *dst)
+get_src_and_dst_ip (void *hdr, ip_address_t * src, ip_address_t * dst)
 {
-  ip4_header_t * ip4 = hdr;
-  ip6_header_t * ip6;
+  ip4_header_t *ip4 = hdr;
+  ip6_header_t *ip6;
 
   if ((ip4->ip_version_and_header_length & 0xF0) == 0x40)
     {
-      ip_addr_v4(src).as_u32 = ip4->src_address.as_u32;
-      ip_addr_version(src) = IP4;
-      ip_addr_v4(dst).as_u32 = ip4->dst_address.as_u32;
-      ip_addr_version(dst) = IP4;
+      ip_address_set (src, &ip4->src_address, IP4);
+      ip_address_set (dst, &ip4->dst_address, IP4);
     }
   else
     {
       ip6 = hdr;
-      memcpy (&ip_addr_v6(src), &ip6->src_address, sizeof(ip6->src_address));
-      ip_addr_version(src) = IP6;
-      memcpy (&ip_addr_v6(dst), &ip6->dst_address, sizeof(ip6->dst_address));
-      ip_addr_version(dst) = IP6;
+      ip_address_set (src, &ip6->src_address, IP6);
+      ip_address_set (dst, &ip6->dst_address, IP6);
+    }
+}
+
+static u32
+lisp_get_vni_from_buffer_ip (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+                            u8 version)
+{
+  uword *vnip;
+  u32 vni = ~0, table_id = ~0;
+
+  table_id = fib_table_get_table_id_for_sw_if_index ((version ==
+                                                     IP4 ? FIB_PROTOCOL_IP4 :
+                                                     FIB_PROTOCOL_IP6),
+                                                    vnet_buffer
+                                                    (b)->sw_if_index
+                                                    [VLIB_RX]);
+
+  vnip = hash_get (lcm->vni_by_table_id, table_id);
+  if (vnip)
+    vni = vnip[0];
+  else
+    clib_warning ("vrf %d is not mapped to any vni!", table_id);
+
+  return vni;
+}
+
+always_inline u32
+lisp_get_vni_from_buffer_eth (lisp_cp_main_t * lcm, vlib_buffer_t * b)
+{
+  uword *vnip;
+  u32 vni = ~0;
+  u32 sw_if_index0;
+
+  l2input_main_t *l2im = &l2input_main;
+  l2_input_config_t *config;
+  l2_bridge_domain_t *bd_config;
+
+  sw_if_index0 = vnet_buffer (b)->sw_if_index[VLIB_RX];
+  config = vec_elt_at_index (l2im->configs, sw_if_index0);
+  bd_config = vec_elt_at_index (l2im->bd_configs, config->bd_index);
+
+  vnip = hash_get (lcm->vni_by_bd_id, bd_config->bd_id);
+  if (vnip)
+    vni = vnip[0];
+  else
+    clib_warning ("bridge domain %d is not mapped to any vni!",
+                 config->bd_index);
+
+  return vni;
+}
+
+always_inline void
+get_src_and_dst_eids_from_buffer (lisp_cp_main_t * lcm, vlib_buffer_t * b,
+                                 gid_address_t * src, gid_address_t * dst)
+{
+  u32 vni = 0;
+  u16 type;
+
+  memset (src, 0, sizeof (*src));
+  memset (dst, 0, sizeof (*dst));
+  type = vnet_buffer (b)->lisp.overlay_afi;
+
+  if (LISP_AFI_IP == type || LISP_AFI_IP6 == type)
+    {
+      ip4_header_t *ip;
+      u8 version, preflen;
+
+      gid_address_type (src) = GID_ADDR_IP_PREFIX;
+      gid_address_type (dst) = GID_ADDR_IP_PREFIX;
+
+      ip = vlib_buffer_get_current (b);
+      get_src_and_dst_ip (ip, &gid_address_ip (src), &gid_address_ip (dst));
+
+      version = gid_address_ip_version (src);
+      preflen = ip_address_max_len (version);
+      gid_address_ippref_len (src) = preflen;
+      gid_address_ippref_len (dst) = preflen;
+
+      vni = lisp_get_vni_from_buffer_ip (lcm, b, version);
+      gid_address_vni (dst) = vni;
+      gid_address_vni (src) = vni;
+    }
+  else if (LISP_AFI_MAC == type)
+    {
+      ethernet_header_t *eh;
+
+      eh = vlib_buffer_get_current (b);
+
+      gid_address_type (src) = GID_ADDR_MAC;
+      gid_address_type (dst) = GID_ADDR_MAC;
+      mac_copy (&gid_address_mac (src), eh->src_address);
+      mac_copy (&gid_address_mac (dst), eh->dst_address);
+
+      /* get vni */
+      vni = lisp_get_vni_from_buffer_eth (lcm, b);
+
+      gid_address_vni (dst) = vni;
+      gid_address_vni (src) = vni;
     }
 }
 
 static uword
-lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node,
-              vlib_frame_t * from_frame)
+lisp_cp_lookup_inline (vlib_main_t * vm,
+                      vlib_node_runtime_t * node,
+                      vlib_frame_t * from_frame, int overlay)
 {
-  u32 * from, * to_next_drop;
-  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main();
+  u32 *from, *to_next_drop, di, si;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
   u32 pkts_mapped = 0;
   uword n_left_from, n_left_to_next_drop;
 
@@ -1091,64 +3180,148 @@ lisp_cp_lookup (vlib_main_t * vm, vlib_node_runtime_t * node,
   while (n_left_from > 0)
     {
       vlib_get_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
-                           to_next_drop, n_left_to_next_drop);
+                          to_next_drop, n_left_to_next_drop);
 
       while (n_left_from > 0 && n_left_to_next_drop > 0)
-        {
-          u32 pi0;
-          vlib_buffer_t * p0;
-          ip4_header_t * ip0;
-          gid_address_t src, dst;
-          ip_prefix_t * spref, * dpref;
-
-          gid_address_type (&src) = IP_PREFIX;
-          spref = &gid_address_ippref(&src);
-          gid_address_type (&dst) = IP_PREFIX;
-          dpref = &gid_address_ippref(&dst);
-
-          pi0 = from[0];
-          from += 1;
-          n_left_from -= 1;
-          to_next_drop[0] = pi0;
-          to_next_drop += 1;
-          n_left_to_next_drop -= 1;
-
-          p0 = vlib_get_buffer (vm, pi0);
-          p0->error = node->errors[LISP_CP_LOOKUP_ERROR_DROP];
-
-          /* src/dst eid pair */
-          ip0 = vlib_buffer_get_current (p0);
-          get_src_and_dst (ip0, &ip_prefix_addr(spref), &ip_prefix_addr(dpref));
-          ip_prefix_len(spref) = ip_address_max_len (ip_prefix_version(spref));
-          ip_prefix_len(dpref) = ip_address_max_len (ip_prefix_version(dpref));
-
-          /* send map-request */
-          send_encapsulated_map_request (vm, lcm, &src, &dst, 0);
-
-          pkts_mapped++;
-
-          if (PREDICT_FALSE(p0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-              lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, p0,
-                                                          sizeof(*tr));
-              gid_address_copy (&tr->dst_eid, &dst);
-              memcpy (&tr->map_resolver_ip,
-                      vec_elt_at_index(lcm->map_resolvers, 0),
-                      sizeof(ip_address_t));
-            }
-        }
-
-      vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP, n_left_to_next_drop);
+       {
+         u32 pi0;
+         vlib_buffer_t *b0;
+         gid_address_t src, dst;
+
+         pi0 = from[0];
+         from += 1;
+         n_left_from -= 1;
+         to_next_drop[0] = pi0;
+         to_next_drop += 1;
+         n_left_to_next_drop -= 1;
+
+         b0 = vlib_get_buffer (vm, pi0);
+         b0->error = node->errors[LISP_CP_LOOKUP_ERROR_DROP];
+         vnet_buffer (b0)->lisp.overlay_afi = overlay;
+
+         /* src/dst eid pair */
+         get_src_and_dst_eids_from_buffer (lcm, b0, &src, &dst);
+
+         /* if we have remote mapping for destination already in map-chache
+            add forwarding tunnel directly. If not send a map-request */
+         di = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid, &dst,
+                                        &src);
+         if (~0 != di)
+           {
+             mapping_t *m = vec_elt_at_index (lcm->mapping_pool, di);
+             /* send a map-request also in case of negative mapping entry
+                with corresponding action */
+             if (m->action == LISP_SEND_MAP_REQUEST)
+               {
+                 /* send map-request */
+                 queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
+                                    0 /* is_resend */ );
+                 pkts_mapped++;
+               }
+             else
+               {
+                 si = gid_dictionary_lookup (&lcm->mapping_index_by_gid,
+                                             &src);
+                 if (~0 != si)
+                   {
+                     dp_add_fwd_entry (lcm, si, di);
+                   }
+               }
+           }
+         else
+           {
+             /* send map-request */
+             queue_map_request (&src, &dst, 0 /* smr_invoked */ ,
+                                0 /* is_resend */ );
+             pkts_mapped++;
+           }
+
+         if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+           {
+             lisp_cp_lookup_trace_t *tr = vlib_add_trace (vm, node, b0,
+                                                          sizeof (*tr));
+
+             memset (tr, 0, sizeof (*tr));
+             gid_address_copy (&tr->dst_eid, &dst);
+             ip_address_copy (&tr->map_resolver_ip,
+                              &lcm->active_map_resolver);
+           }
+         gid_address_free (&dst);
+         gid_address_free (&src);
+       }
+
+      vlib_put_next_frame (vm, node, LISP_CP_LOOKUP_NEXT_DROP,
+                          n_left_to_next_drop);
     }
   vlib_node_increment_counter (vm, node->node_index,
-                               LISP_CP_LOOKUP_ERROR_MAP_REQUESTS_SENT,
-                               pkts_mapped);
+                              LISP_CP_LOOKUP_ERROR_MAP_REQUESTS_SENT,
+                              pkts_mapped);
   return from_frame->n_vectors;
 }
 
-VLIB_REGISTER_NODE (lisp_cp_lookup_node) = {
-  .function = lisp_cp_lookup,
-  .name = "lisp-cp-lookup",
+static uword
+lisp_cp_lookup_ip4 (vlib_main_t * vm,
+                   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_IP));
+}
+
+static uword
+lisp_cp_lookup_ip6 (vlib_main_t * vm,
+                   vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_IP6));
+}
+
+static uword
+lisp_cp_lookup_l2 (vlib_main_t * vm,
+                  vlib_node_runtime_t * node, vlib_frame_t * from_frame)
+{
+  return (lisp_cp_lookup_inline (vm, node, from_frame, LISP_AFI_MAC));
+}
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_lookup_ip4_node) = {
+  .function = lisp_cp_lookup_ip4,
+  .name = "lisp-cp-lookup-ip4",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lisp_cp_lookup_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LISP_CP_LOOKUP_N_ERROR,
+  .error_strings = lisp_cp_lookup_error_strings,
+
+  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
+
+  .next_nodes = {
+      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_lookup_ip6_node) = {
+  .function = lisp_cp_lookup_ip6,
+  .name = "lisp-cp-lookup-ip6",
+  .vector_size = sizeof (u32),
+  .format_trace = format_lisp_cp_lookup_trace,
+  .type = VLIB_NODE_TYPE_INTERNAL,
+
+  .n_errors = LISP_CP_LOOKUP_N_ERROR,
+  .error_strings = lisp_cp_lookup_error_strings,
+
+  .n_next_nodes = LISP_CP_LOOKUP_N_NEXT,
+
+  .next_nodes = {
+      [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
+  },
+};
+/* *INDENT-ON* */
+
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_cp_lookup_l2_node) = {
+  .function = lisp_cp_lookup_l2,
+  .name = "lisp-cp-lookup-l2",
   .vector_size = sizeof (u32),
   .format_trace = format_lisp_cp_lookup_trace,
   .type = VLIB_NODE_TYPE_INTERNAL,
@@ -1160,17 +3333,16 @@ VLIB_REGISTER_NODE (lisp_cp_lookup_node) = {
 
   .next_nodes = {
       [LISP_CP_LOOKUP_NEXT_DROP] = "error-drop",
-      [LISP_CP_LOOKUP_NEXT_IP4_LOOKUP] = "ip4-lookup",
-      [LISP_CP_LOOKUP_NEXT_IP6_LOOKUP] = "ip6-lookup",
   },
 };
+/* *INDENT-ON* */
 
 /* lisp_cp_input statistics */
-#define foreach_lisp_cp_input_error                   \
-_(DROP, "drop")                                        \
+#define foreach_lisp_cp_input_error                     \
+_(DROP, "drop")                                         \
 _(MAP_REPLIES_RECEIVED, "map-replies received")
 
-static char * lisp_cp_input_error_strings[] = {
+static char *lisp_cp_input_error_strings[] = {
 #define _(sym,string) string,
   foreach_lisp_cp_input_error
 #undef _
@@ -1179,7 +3351,7 @@ static char * lisp_cp_input_error_strings[] = {
 typedef enum
 {
 #define _(sym,str) LISP_CP_INPUT_ERROR_##sym,
-    foreach_lisp_cp_input_error
+  foreach_lisp_cp_input_error
 #undef _
     LISP_CP_INPUT_N_ERROR,
 } lisp_cp_input_error_t;
@@ -1201,297 +3373,111 @@ format_lisp_cp_input_trace (u8 * s, va_list * args)
 {
   CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
   CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
-  CLIB_UNUSED(lisp_cp_input_trace_t * t) = va_arg (*args, lisp_cp_input_trace_t *);
+  CLIB_UNUSED (lisp_cp_input_trace_t * t) =
+    va_arg (*args, lisp_cp_input_trace_t *);
 
   s = format (s, "LISP-CP-INPUT: TODO");
   return s;
 }
 
-ip_interface_address_t *
-ip_interface_get_first_interface_address (ip_lookup_main_t *lm, u32 sw_if_index,
-                                          u8 loop)
-{
-  vnet_main_t *vnm = vnet_get_main ();
-  vnet_sw_interface_t * swif = vnet_get_sw_interface (vnm, sw_if_index);
-  if (loop && swif->flags & VNET_SW_INTERFACE_FLAG_UNNUMBERED)
-    sw_if_index = swif->unnumbered_sw_if_index;
-  u32 ia =
-      (vec_len((lm)->if_address_pool_index_by_sw_if_index) > (sw_if_index)) ?
-          vec_elt((lm)->if_address_pool_index_by_sw_if_index, (sw_if_index)) :
-          (u32) ~0;
-  return pool_elt_at_index((lm)->if_address_pool, ia);
-}
-
 void *
-ip_interface_get_first_ip_addres (ip_lookup_main_t *lm, u32 sw_if_index,
-                                   u8 loop)
-{
-  ip_interface_address_t * ia = ip_interface_get_first_interface_address (
-      lm, sw_if_index, loop);
-  return ip_interface_address_get_address (lm, ia);
-}
-
-void
-del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index,
-               u32 dst_map_index)
-{
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a;
-  fwd_entry_t * fe = 0;
-  uword * feip = 0;
-  memset(a, 0, sizeof(*a));
-
-  feip = hash_get(lcm->fwd_entry_by_mapping_index, dst_map_index);
-  if (!feip)
-    return;
-
-  fe = pool_elt_at_index(lcm->fwd_entry_pool, feip[0]);
-
-  /* delete dp fwd entry */
-  u32 sw_if_index;
-  a->is_add = 0;
-  a->dlocator = fe->dst_loc;
-  a->slocator = fe->src_loc;
-  a->iid = 0; // XXX should be part of mapping/eid
-  gid_address_copy(&a->deid, &fe->deid);
-
-  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
-
-  /* delete entry in fwd table */
-  hash_unset(lcm->fwd_entry_by_mapping_index, dst_map_index);
-  pool_put(lcm->fwd_entry_pool, fe);
-}
-
-void
-add_fwd_entry (lisp_cp_main_t* lcm, u32 src_map_index, u32 dst_map_index)
-{
-  mapping_t * src_map, * dst_map;
-  locator_set_t * dst_ls, * src_ls;
-  u32 i, minp = ~0;
-  locator_t * dl = 0;
-  uword * feip = 0;
-  vnet_lisp_gpe_add_del_fwd_entry_args_t _a, * a = &_a;
-  memset (a, 0, sizeof(*a));
-
-  /* remove entry if it already exists */
-  feip = hash_get (lcm->fwd_entry_by_mapping_index, dst_map_index);
-  if (feip)
-    del_fwd_entry (lcm, src_map_index, dst_map_index);
-
-  src_map = pool_elt_at_index (lcm->mapping_pool, src_map_index);
-  dst_map = pool_elt_at_index (lcm->mapping_pool, dst_map_index);
-
-  /* XXX simple forwarding policy: first lowest (value) priority locator */
-  dst_ls = pool_elt_at_index (lcm->locator_set_pool,
-                              dst_map->locator_set_index);
-  for (i = 0; i < vec_len (dst_ls->locator_indices); i++)
-    {
-      u32 li = vec_elt (dst_ls->locator_indices, i);
-      locator_t * l = pool_elt_at_index (lcm->locator_pool, li);
-      if (l->priority < minp && gid_address_type(&l->address) == IP_PREFIX)
-        {
-          minp = l->priority;
-          dl = l;
-        }
-    }
-  if (dl)
-    {
-      src_ls = pool_elt_at_index (lcm->locator_set_pool,
-                                  src_map->locator_set_index);
-      for (i = 0; i < vec_len (src_ls->locator_indices); i++)
-        {
-          u32 li = vec_elt (src_ls->locator_indices, i);
-          locator_t * sl = pool_elt_at_index (lcm->locator_pool, li);
-
-          if (ip_addr_version(&gid_address_ip(&dl->address)) == IP4)
-            {
-              ip4_address_t * l4;
-              l4 = ip_interface_get_first_ip_addres (&lcm->im4->lookup_main,
-                                                     sl->sw_if_index,
-                                                     1 /* unnumbered */);
-              ip_addr_v4(&a->slocator) = *l4;
-              ip_addr_version(&a->slocator) = IP4;
-            }
-          else
-            {
-              ip6_address_t * l6;
-              l6 = ip_interface_get_first_ip_addres (&lcm->im6->lookup_main,
-                                                     sl->sw_if_index,
-                                                     1 /* unnumbered */);
-              ip_addr_v6(&a->slocator) = *l6;
-              ip_addr_version(&a->slocator) = IP6;
-            }
-        }
-    }
-  /* insert data plane forwarding entry */
-  u32 sw_if_index;
-  a->is_add = 1;
-  if (dl)
-    a->dlocator = gid_address_ip(&dl->address);
-  else
-    {
-      a->is_negative = 1;
-      a->action = dst_map->action;
-    }
-
-  gid_address_copy (&a->deid, &dst_map->eid);
-  a->iid = 0; // XXX should be part of mapping/eid
-  u8 ipver = ip_prefix_version(&gid_address_ippref(&a->deid));
-  a->decap_next_index = (ipver == IP4) ?
-          LISP_GPE_INPUT_NEXT_IP4_INPUT : LISP_GPE_INPUT_NEXT_IP6_INPUT;
-  /* XXX tunnels work only with IP4 now */
-  vnet_lisp_gpe_add_del_fwd_entry (a, &sw_if_index);
-
-  /* add tunnel to fwd entry table XXX check return value from DP insertion */
-  fwd_entry_t* fe;
-  pool_get (lcm->fwd_entry_pool, fe);
-  fe->dst_loc = a->dlocator;
-  fe->src_loc = a->slocator;
-  gid_address_copy (&fe->deid, &a->deid);
-  hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index,
-            fe - lcm->fwd_entry_pool);
-}
-
-/* return 0 if the two locator sets are identical 1 otherwise */
-static u8
-compare_locators (lisp_cp_main_t *lcm, u32 * old_ls_indexes,
-                  locator_t * new_locators)
-{
-  u32 i, old_li;
-  locator_t * old_loc, * new_loc;
-
-  if (vec_len (old_ls_indexes) != vec_len(new_locators))
-    return 1;
-
-  for (i = 0; i < vec_len(new_locators); i++)
-    {
-      old_li = vec_elt(old_ls_indexes, i);
-      old_loc = pool_elt_at_index(lcm->locator_pool, old_li);
-
-      new_loc = vec_elt_at_index(new_locators, i);
-
-      if (locator_cmp (old_loc, new_loc))
-        return 1;
-    }
-  return 0;
-}
-
-void
-process_map_reply (lisp_cp_main_t * lcm, vlib_buffer_t * b)
+process_map_reply (void *arg)
 {
-  u32 len = 0, i, ls_index = 0;
-  void * h;
-  vnet_lisp_add_del_locator_set_args_t _ls_arg, * ls_arg = &_ls_arg;
-  vnet_lisp_add_del_mapping_args_t _m_args, * m_args = &_m_args;
-  pending_map_request_t * pmr;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  vlib_buffer_t *b = arg;
+  u32 len = 0, i, ttl, dst_map_index = 0;
+  void *h;
+  pending_map_request_t *pmr;
   locator_t probed;
-  map_reply_hdr_t * mrep_hdr;
-  u64 nonce;
-  u32 dst_map_index, mi;
-  uword * pmr_index;
+  map_reply_hdr_t *mrep_hdr;
+  u64 nonce, *noncep;
+  gid_address_t deid;
+  uword *pmr_index;
+  u8 authoritative, action;
+  locator_t *locators = 0, *loc;
 
   mrep_hdr = vlib_buffer_get_current (b);
 
+  lisp_pending_map_request_lock (lcm);
+
   /* Check pending requests table and nonce */
-  nonce = MREP_NONCE(mrep_hdr);
-  pmr_index = hash_get(lcm->pending_map_requests_by_nonce, nonce);
+  nonce = MREP_NONCE (mrep_hdr);
+  pmr_index = hash_get (lcm->pending_map_requests_by_nonce, nonce);
   if (!pmr_index)
     {
-      clib_warning("No pending map-request entry with nonce %lu!", nonce);
-      return;
+      clib_warning ("No pending map-request entry with nonce %lu!", nonce);
+      goto done;
     }
-  pmr = pool_elt_at_index(lcm->pending_map_requests_pool, pmr_index[0]);
+  pmr = pool_elt_at_index (lcm->pending_map_requests_pool, pmr_index[0]);
 
-  vlib_buffer_pull (b, sizeof(*mrep_hdr));
+  vlib_buffer_pull (b, sizeof (*mrep_hdr));
 
-  for (i = 0; i < MREP_REC_COUNT(mrep_hdr); i++)
+  for (i = 0; i < MREP_REC_COUNT (mrep_hdr); i++)
     {
-      memset (ls_arg, 0, sizeof(*ls_arg));
-      memset (m_args, 0, sizeof(*m_args));
-
       h = vlib_buffer_get_current (b);
-      m_args->ttl = clib_net_to_host_u32 (MAP_REC_TTL(h));
-      m_args->action = MAP_REC_ACTION(h);
-      m_args->authoritative = MAP_REC_AUTH(h);
+      ttl = clib_net_to_host_u32 (MAP_REC_TTL (h));
+      action = MAP_REC_ACTION (h);
+      authoritative = MAP_REC_AUTH (h);
 
-      len = lisp_msg_parse_mapping_record (b, &m_args->deid, &ls_arg->locators,
-                                           &probed);
+      len = lisp_msg_parse_mapping_record (b, &deid, &locators, &probed);
       if (len == ~0)
-        {
-          clib_warning ("Failed to parse mapping record!");
-          vec_free(ls_arg->locators);
-          return;
-        }
-
-      mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &m_args->deid);
-
-      /* if mapping already exists, decide if locators (and forwarding) should
-       * be updated and be done */
-      if (mi != ~0)
-        {
-          mapping_t * old_map;
-          locator_set_t * old_ls;
-          old_map = pool_elt_at_index(lcm->mapping_pool, mi);
-
-          /* update mapping attributes */
-          old_map->action = m_args->action;
-          old_map->authoritative = m_args->authoritative;
-          old_map->ttl = m_args->ttl;
-
-          old_ls = pool_elt_at_index(lcm->locator_set_pool,
-                                     old_map->locator_set_index);
-          /* if the two locators are not equal, update them and forwarding
-           * otherwise there's nothing to be done */
-          if (compare_locators (lcm, old_ls->locator_indices, ls_arg->locators))
-            {
-              /* set locator-set index to overwrite */
-              ls_arg->is_add = 1;
-              ls_arg->index = old_map->locator_set_index;
-              vnet_lisp_add_del_locator_set (ls_arg, 0);
-              add_fwd_entry (lcm, pmr->src_mapping_index, mi);
-            }
-        }
-      /* new mapping */
-      else
-        {
-          /* add locator-set */
-          ls_arg->is_add = 1;
-          ls_arg->index = ~0;
-          vnet_lisp_add_del_locator_set (ls_arg, &ls_index);
-
-          /* add mapping */
-          m_args->is_add = 1;
-          m_args->locator_set_index = ls_index;
-          vnet_lisp_add_del_mapping (m_args, &dst_map_index);
-
-          /* add forwarding tunnel */
-          add_fwd_entry (lcm, pmr->src_mapping_index, dst_map_index);
-        }
-      vec_free(ls_arg->locators);
+       {
+         clib_warning ("Failed to parse mapping record!");
+         vec_foreach (loc, locators)
+         {
+           locator_free (loc);
+         }
+         vec_free (locators);
+         goto done;
+       }
+
+      /* insert/update mappings cache */
+      vnet_lisp_add_del_mapping (&deid, locators, action, authoritative, ttl,
+                                1, 0 /* is_static */ , &dst_map_index);
+
+      /* try to program forwarding only if mapping saved or updated */
+      if ((u32) ~ 0 != dst_map_index)
+       lisp_add_del_adjacency (lcm, &pmr->src, &deid, 1);
+
+      vec_free (locators);
     }
 
   /* remove pending map request entry */
-  hash_unset(lcm->pending_map_requests_by_nonce, nonce);
-  pool_put(lcm->pending_map_requests_pool, pmr);
+
+  /* *INDENT-OFF* */
+  clib_fifo_foreach (noncep, pmr->nonces, ({
+    hash_unset(lcm->pending_map_requests_by_nonce, noncep[0]);
+  }));
+  /* *INDENT-ON* */
+
+  clib_fifo_free (pmr->nonces);
+  pool_put (lcm->pending_map_requests_pool, pmr);
+
+done:
+  lisp_pending_map_request_unlock (lcm);
+  return 0;
 }
 
 void
-process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm, vlib_buffer_t * b)
+process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm,
+                    vlib_buffer_t * b)
 {
-  map_request_hdr_t * mreq_hdr;
+  map_request_hdr_t *mreq_hdr;
   gid_address_t src, dst;
 //  u64 nonce;
   u32 i, len = 0;
-  gid_address_t * itr_rlocs = 0;
+  gid_address_t *itr_rlocs = 0, *rloc;
 
   mreq_hdr = vlib_buffer_get_current (b);
-  vlib_buffer_pull (b, sizeof(*mreq_hdr));
+  vlib_buffer_pull (b, sizeof (*mreq_hdr));
 
 //  nonce = MREQ_NONCE(mreq_hdr);
 
-  if (!MREQ_SMR(mreq_hdr)) {
-      clib_warning("Only SMR Map-Requests supported for now!");
+  if (!MREQ_SMR (mreq_hdr))
+    {
+      clib_warning ("Only SMR Map-Requests supported for now!");
       return;
-  }
+    }
 
   /* parse src eid */
   len = lisp_msg_parse_addr (b, &src);
@@ -1499,32 +3485,54 @@ process_map_request (vlib_main_t * vm, lisp_cp_main_t * lcm, vlib_buffer_t * b)
     return;
 
   /* for now we don't do anything with the itr's rlocs */
-  len = lisp_msg_parse_itr_rlocs (b, &itr_rlocs, MREQ_ITR_RLOC_COUNT(mreq_hdr) + 1);
+  len =
+    lisp_msg_parse_itr_rlocs (b, &itr_rlocs,
+                             MREQ_ITR_RLOC_COUNT (mreq_hdr) + 1);
   if (len == ~0)
     return;
 
+  /* TODO: RLOCs are currently unused, so free them for now */
+  vec_foreach (rloc, itr_rlocs)
+  {
+    gid_address_free (rloc);
+  }
+
   /* parse eid records and send SMR-invoked map-requests */
-  for (i = 0; i < MREQ_REC_COUNT(mreq_hdr); i++)
+  for (i = 0; i < MREQ_REC_COUNT (mreq_hdr); i++)
     {
-      memset(&dst, 0, sizeof(dst));
+      memset (&dst, 0, sizeof (dst));
       len = lisp_msg_parse_eid_rec (b, &dst);
       if (len == ~0)
-        {
-          clib_warning("Can't parse map-request EID-record");
-          return;
-        }
+       {
+         clib_warning ("Can't parse map-request EID-record");
+         return;
+       }
       /* send SMR-invoked map-requests */
-      send_encapsulated_map_request (vm, lcm, &dst, &src, /* invoked */ 1);
+      queue_map_request (&dst, &src, 1 /* invoked */ , 0 /* resend */ );
     }
 }
 
+static void
+queue_map_reply (vlib_buffer_t * b)
+{
+  vlib_buffer_t *a = clib_mem_alloc (sizeof (a[0]) + b->current_length);
+
+  clib_memcpy (a->data, b->data + b->current_data, b->current_length);
+  a->current_length = b->current_length;
+  a->current_data = 0;
+
+  vl_api_rpc_call_main_thread (process_map_reply, (u8 *) a, sizeof (a[0])
+                              + a->current_length);
+  clib_mem_free (a);
+}
+
 static uword
 lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node,
-               vlib_frame_t * from_frame)
+              vlib_frame_t * from_frame)
 {
-  u32 n_left_from, * from, * to_next_drop;
+  u32 n_left_from, *from, *to_next_drop;
   lisp_msg_type_e type;
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
 
   from = vlib_frame_vector_args (from_frame);
   n_left_from = from_frame->n_vectors;
@@ -1535,48 +3543,50 @@ lisp_cp_input (vlib_main_t * vm, vlib_node_runtime_t * node,
       u32 n_left_to_next_drop;
 
       vlib_get_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
-                           to_next_drop, n_left_to_next_drop);
+                          to_next_drop, n_left_to_next_drop);
       while (n_left_from > 0 && n_left_to_next_drop > 0)
-        {
-          u32 bi0;
-          vlib_buffer_t * b0;
-
-          bi0 = from[0];
-          from += 1;
-          n_left_from -= 1;
-          to_next_drop[0] = bi0;
-          to_next_drop += 1;
-          n_left_to_next_drop -= 1;
-
-          b0 = vlib_get_buffer (vm, bi0);
-
-          type = lisp_msg_type(vlib_buffer_get_current (b0));
-          switch (type)
-            {
-            case LISP_MAP_REPLY:
-              process_map_reply (lcm, b0);
-              break;
-            case LISP_MAP_REQUEST:
-              process_map_request(vm, lcm, b0);
-              break;
-            default:
-              clib_warning("Unsupported LISP message type %d", type);
-              break;
-            }
-
-          b0->error = node->errors[LISP_CP_INPUT_ERROR_DROP];
-
-          if (PREDICT_FALSE(b0->flags & VLIB_BUFFER_IS_TRACED))
-            {
-
-            }
-        }
-
-      vlib_put_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP, n_left_to_next_drop);
+       {
+         u32 bi0;
+         vlib_buffer_t *b0;
+
+         bi0 = from[0];
+         from += 1;
+         n_left_from -= 1;
+         to_next_drop[0] = bi0;
+         to_next_drop += 1;
+         n_left_to_next_drop -= 1;
+
+         b0 = vlib_get_buffer (vm, bi0);
+
+         type = lisp_msg_type (vlib_buffer_get_current (b0));
+         switch (type)
+           {
+           case LISP_MAP_REPLY:
+             queue_map_reply (b0);
+             break;
+           case LISP_MAP_REQUEST:
+             process_map_request (vm, lcm, b0);
+             break;
+           default:
+             clib_warning ("Unsupported LISP message type %d", type);
+             break;
+           }
+
+         b0->error = node->errors[LISP_CP_INPUT_ERROR_DROP];
+
+         if (PREDICT_FALSE (b0->flags & VLIB_BUFFER_IS_TRACED))
+           {
+
+           }
+       }
+
+      vlib_put_next_frame (vm, node, LISP_CP_INPUT_NEXT_DROP,
+                          n_left_to_next_drop);
     }
   return from_frame->n_vectors;
 }
 
+/* *INDENT-OFF* */
 VLIB_REGISTER_NODE (lisp_cp_input_node) = {
   .function = lisp_cp_input,
   .name = "lisp-cp-input",
@@ -1593,12 +3603,13 @@ VLIB_REGISTER_NODE (lisp_cp_input_node) = {
       [LISP_CP_INPUT_NEXT_DROP] = "error-drop",
   },
 };
+/* *INDENT-ON* */
 
 clib_error_t *
-lisp_cp_init (vlib_main_t *vm)
+lisp_cp_init (vlib_main_t * vm)
 {
-  lisp_cp_main_t * lcm = vnet_lisp_cp_get_main();
-  clib_error_t * error = 0;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  clib_error_t *error = 0;
 
   if ((error = vlib_call_init_function (vm, lisp_gpe_init)))
     return error;
@@ -1606,17 +3617,200 @@ lisp_cp_init (vlib_main_t *vm)
   lcm->im4 = &ip4_main;
   lcm->im6 = &ip6_main;
   lcm->vlib_main = vm;
-  lcm->vnet_main = vnet_get_main();
+  lcm->vnet_main = vnet_get_main ();
+  lcm->mreq_itr_rlocs = ~0;
+  lcm->lisp_pitr = 0;
+  memset (&lcm->active_map_resolver, 0, sizeof (lcm->active_map_resolver));
 
+  lcm->pending_map_request_lock =
+    clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES, CLIB_CACHE_LINE_BYTES);
+
+  lcm->pending_map_request_lock[0] = 0;
   gid_dictionary_init (&lcm->mapping_index_by_gid);
-  gid_dictionary_init (&lcm->mapping_index_by_gid);
+  lcm->do_map_resolver_election = 1;
+  lcm->map_request_mode = MR_MODE_DST_ONLY;
+
+  /* default vrf mapped to vni 0 */
+  hash_set (lcm->table_id_by_vni, 0, 0);
+  hash_set (lcm->vni_by_table_id, 0, 0);
 
   udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp,
-                         lisp_cp_input_node.index, 1 /* is_ip4 */);
+                        lisp_cp_input_node.index, 1 /* is_ip4 */ );
   udp_register_dst_port (vm, UDP_DST_PORT_lisp_cp6,
-                         lisp_cp_input_node.index, 0 /* is_ip4 */);
+                        lisp_cp_input_node.index, 0 /* is_ip4 */ );
+
+  return 0;
+}
+
+static void *
+send_map_request_thread_fn (void *arg)
+{
+  map_request_args_t *a = arg;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  if (a->is_resend)
+    /* if resending, we already have the lock */
+    resend_encapsulated_map_request (lcm, &a->seid, &a->deid, a->smr_invoked);
+  else
+    {
+      /* get lock before sending map-request */
+      lisp_pending_map_request_lock (lcm);
+      send_encapsulated_map_request (lcm, &a->seid, &a->deid, a->smr_invoked);
+      lisp_pending_map_request_unlock (lcm);
+    }
+
+
+  return 0;
+}
+
+static int
+queue_map_request (gid_address_t * seid, gid_address_t * deid,
+                  u8 smr_invoked, u8 is_resend)
+{
+  map_request_args_t a;
+
+  a.is_resend = is_resend;
+  gid_address_copy (&a.seid, seid);
+  gid_address_copy (&a.deid, deid);
+  a.smr_invoked = smr_invoked;
+
+  vl_api_rpc_call_main_thread (send_map_request_thread_fn,
+                              (u8 *) & a, sizeof (a));
+  return 0;
+}
+
+/**
+ * Take an action with a pending map request depending on expiration time
+ * and re-try counters.
+ */
+static void
+update_pending_request (pending_map_request_t * r, f64 dt)
+{
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+  map_resolver_t *mr;
+
+  if (r->time_to_expire - dt < 0)
+    /* it's time to decide what to do with this pending request */
+    {
+      if (r->retries_num >= NUMBER_OF_RETRIES)
+       /* too many retries -> assume current map resolver is not available */
+       {
+         mr = get_map_resolver (&lcm->active_map_resolver);
+         if (!mr)
+           {
+             clib_warning ("Map resolver %U not found - probably deleted "
+                           "by the user recently.", format_ip_address,
+                           &lcm->active_map_resolver);
+           }
+         else
+           {
+             clib_warning ("map resolver %U is unreachable, ignoring",
+                           format_ip_address, &lcm->active_map_resolver);
+
+             /* mark current map resolver unavailable so it won't be
+              * selected next time */
+             mr->is_down = 1;
+             mr->last_update = vlib_time_now (lcm->vlib_main);
+           }
+
+         reset_pending_mr_counters (r);
+         elect_map_resolver (lcm);
+
+         /* try to find a next eligible map resolver and re-send */
+         queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
+                            1 /* resend */ );
+       }
+      else
+       {
+         /* try again */
+         queue_map_request (&r->src, &r->dst, r->is_smr_invoked,
+                            1 /* resend */ );
+         r->retries_num++;
+         r->time_to_expire = PENDING_MREQ_EXPIRATION_TIME;
+       }
+    }
+  else
+    r->time_to_expire -= dt;
+}
 
+static void
+remove_dead_pending_map_requests (lisp_cp_main_t * lcm)
+{
+  u64 *nonce;
+  pending_map_request_t *pmr;
+  u32 *to_be_removed = 0, *pmr_index;
+
+  ASSERT (*lcm->pending_map_request_lock);
+
+  /* *INDENT-OFF* */
+  pool_foreach (pmr, lcm->pending_map_requests_pool,
+  ({
+    if (pmr->to_be_removed)
+      {
+        clib_fifo_foreach (nonce, pmr->nonces, ({
+          hash_unset (lcm->pending_map_requests_by_nonce, nonce[0]);
+        }));
+
+        vec_add1 (to_be_removed, pmr - lcm->pending_map_requests_pool);
+      }
+  }));
+  /* *INDENT-ON* */
+
+  vec_foreach (pmr_index, to_be_removed)
+    pool_put_index (lcm->pending_map_requests_by_nonce, pmr_index[0]);
+
+  vec_free (to_be_removed);
+}
+
+static uword
+send_map_resolver_service (vlib_main_t * vm,
+                          vlib_node_runtime_t * rt, vlib_frame_t * f)
+{
+  f64 period = 2.0;
+  pending_map_request_t *pmr;
+  lisp_cp_main_t *lcm = vnet_lisp_cp_get_main ();
+
+  while (1)
+    {
+      vlib_process_wait_for_event_or_clock (vm, period);
+
+      /* currently no signals are expected - just wait for clock */
+      (void) vlib_process_get_events (vm, 0);
+
+      lisp_pending_map_request_lock (lcm);
+
+      /* *INDENT-OFF* */
+      pool_foreach (pmr, lcm->pending_map_requests_pool,
+      ({
+        if (!pmr->to_be_removed)
+          update_pending_request (pmr, period);
+      }));
+      /* *INDENT-ON* */
+
+      remove_dead_pending_map_requests (lcm);
+
+      lisp_pending_map_request_unlock (lcm);
+    }
+
+  /* unreachable */
   return 0;
 }
 
-VLIB_INIT_FUNCTION(lisp_cp_init);
+/* *INDENT-OFF* */
+VLIB_REGISTER_NODE (lisp_retry_service_node,static) = {
+    .function = send_map_resolver_service,
+    .type = VLIB_NODE_TYPE_PROCESS,
+    .name = "lisp-retry-service",
+    .process_log2_n_stack_bytes = 16,
+};
+/* *INDENT-ON* */
+
+VLIB_INIT_FUNCTION (lisp_cp_init);
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "gnu")
+ * End:
+ */