2 files changed, 46 insertions, 67 deletions

diff --git a/vnet/vnet/lisp-cp/control.c b/vnet/vnet/lisp-cp/control.c
index 2e89286ddc4..940d5893e67 100644
--- a/vnet/vnet/lisp-cp/control.c
+++ b/vnet/vnet/lisp-cp/control.c
@@ -245,8 +245,8 @@ dp_del_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_index)
   u32 sw_if_index;
   a->is_add = 0;
   a->locator_pairs = fe->locator_pairs;
-  a->vni = gid_address_vni (&fe->deid);
-  gid_address_copy (&a->rmt_eid, &fe->deid);
+  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);
 
@@ -453,7 +453,7 @@ dp_add_fwd_entry (lisp_cp_main_t * lcm, u32 src_map_index, u32 dst_map_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->deid, &a->rmt_eid);
+  gid_address_copy (&fe->reid, &a->rmt_eid);
   hash_set (lcm->fwd_entry_by_mapping_index, dst_map_index,
 	    fe - lcm->fwd_entry_pool);
 }
@@ -1032,7 +1032,7 @@ 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->seid, &a->deid, a->is_add);
+  return lisp_add_del_adjacency (lcm, &a->leid, &a->reid, a->is_add);
 }
 
 /**
@@ -1178,26 +1178,23 @@ lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
   unformat_input_t _line_input, *line_input = &_line_input;
   vnet_lisp_add_del_adjacency_args_t _a, *a = &_a;
   u8 is_add = 1;
-  locator_t rloc, *rlocs = 0;
-  ip_prefix_t *deid_ippref, *seid_ippref;
-  gid_address_t seid, deid;
-  u8 *dmac = gid_address_mac (&deid);
-  u8 *smac = gid_address_mac (&seid);
-  u8 deid_set = 0, seid_set = 0;
-  u8 *s = 0;
-  u32 vni, action = ~0;
+  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 (&deid, 0, sizeof (deid));
-  memset (&seid, 0, sizeof (seid));
-  memset (&rloc, 0, sizeof (rloc));
+  memset (&reid, 0, sizeof (reid));
+  memset (&leid, 0, sizeof (leid));
 
-  seid_ippref = &gid_address_ippref (&seid);
-  deid_ippref = &gid_address_ippref (&deid);
+  leid_ippref = &gid_address_ippref (&leid);
+  reid_ippref = &gid_address_ippref (&reid);
 
   while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT)
     {
@@ -1205,32 +1202,32 @@ lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	is_add = 0;
       else if (unformat (line_input, "add"))
 	;
-      else if (unformat (line_input, "deid %U",
-			 unformat_ip_prefix, deid_ippref))
+      else if (unformat (line_input, "reid %U",
+			 unformat_ip_prefix, reid_ippref))
 	{
-	  gid_address_type (&deid) = GID_ADDR_IP_PREFIX;
-	  deid_set = 1;
+	  gid_address_type (&reid) = GID_ADDR_IP_PREFIX;
+	  reid_set = 1;
 	}
-      else if (unformat (line_input, "deid %U", unformat_mac_address, dmac))
+      else if (unformat (line_input, "reid %U", unformat_mac_address, dmac))
 	{
-	  gid_address_type (&deid) = GID_ADDR_MAC;
-	  deid_set = 1;
+	  gid_address_type (&reid) = GID_ADDR_MAC;
+	  reid_set = 1;
 	}
       else if (unformat (line_input, "vni %u", &vni))
 	{
-	  gid_address_vni (&seid) = vni;
-	  gid_address_vni (&deid) = vni;
+	  gid_address_vni (&leid) = vni;
+	  gid_address_vni (&reid) = vni;
 	}
-      else if (unformat (line_input, "seid %U",
-			 unformat_ip_prefix, seid_ippref))
+      else if (unformat (line_input, "leid %U",
+			 unformat_ip_prefix, leid_ippref))
 	{
-	  gid_address_type (&seid) = GID_ADDR_IP_PREFIX;
-	  seid_set = 1;
+	  gid_address_type (&leid) = GID_ADDR_IP_PREFIX;
+	  leid_set = 1;
 	}
-      else if (unformat (line_input, "seid %U", unformat_mac_address, smac))
+      else if (unformat (line_input, "leid %U", unformat_mac_address, smac))
 	{
-	  gid_address_type (&seid) = GID_ADDR_MAC;
-	  seid_set = 1;
+	  gid_address_type (&leid) = GID_ADDR_MAC;
+	  leid_set = 1;
 	}
       else
 	{
@@ -1239,39 +1236,24 @@ lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
 	}
     }
 
-  if (!deid_set)
+  if (!reid_set || !leid_set)
     {
-      clib_warning ("missing deid!");
+      clib_warning ("missing remote or local eid!");
       goto done;
     }
 
-  if (GID_ADDR_IP_PREFIX == gid_address_type (&deid))
-    {
-      /* if seid not set, make sure the ip version is the same as that
-       * of the deid. This ensures the seid to be configured will be
-       * either 0/0 or ::/0 */
-      if (!seid_set)
-	ip_prefix_version (seid_ippref) = ip_prefix_version (deid_ippref);
-
-      if (is_add &&
-	  (ip_prefix_version (deid_ippref)
-	   != ip_prefix_version (seid_ippref)))
-	{
-	  clib_warning ("source and destination EIDs are not"
-			" in the same IP family!");
-	  goto done;
-	}
-    }
-
-  if (is_add && (~0 == action) && 0 == vec_len (rlocs))
+  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 ("no action set for negative map-reply!");
-      goto done;
+      clib_warning ("remote and local EIDs are of different types!");
+      return error;
     }
 
   memset (a, 0, sizeof (a[0]));
-  gid_address_copy (&a->seid, &deid);
-  gid_address_copy (&a->deid, &seid);
+  gid_address_copy (&a->leid, &leid);
+  gid_address_copy (&a->reid, &reid);
 
   a->is_add = is_add;
   rv = vnet_lisp_add_del_adjacency (a);
@@ -1281,17 +1263,14 @@ lisp_add_del_adjacency_command_fn (vlib_main_t * vm, unformat_input_t * input,
 
 done:
   unformat_free (line_input);
-  if (s)
-    vec_free (s);
   return error;
 }
 
 /* *INDENT-OFF* */
 VLIB_CLI_COMMAND (lisp_add_del_adjacency_command) = {
     .path = "lisp adjacency",
-    .short_help = "lisp adjacency add|del vni <vni>"
-     "deid <dest-eid> seid <src-eid> [action <no-action|natively-forward|"
-     "send-map-request|drop>] rloc <dst-locator> [rloc <dst-locator> ... ]",
+    .short_help = "lisp adjacency add|del vni <vni> reid <remote-eid> "
+      "leid <local-eid>",
     .function = lisp_add_del_adjacency_command_fn,
 };
 /* *INDENT-ON* */
diff --git a/vnet/vnet/lisp-cp/control.h b/vnet/vnet/lisp-cp/control.h
index 1c8abfb359b..d9dc81d1a78 100644
--- a/vnet/vnet/lisp-cp/control.h
+++ b/vnet/vnet/lisp-cp/control.h
@@ -37,8 +37,8 @@ typedef struct
 
 typedef struct
 {
-  gid_address_t seid;
-  gid_address_t deid;
+  gid_address_t leid;
+  gid_address_t reid;
   locator_pair_t *locator_pairs;
 } fwd_entry_t;
 
@@ -217,8 +217,8 @@ vnet_lisp_add_del_mapping (gid_address_t * deid, locator_t * dlocs, u8 action,
 
 typedef struct
 {
-  gid_address_t deid;
-  gid_address_t seid;
+  gid_address_t reid;
+  gid_address_t leid;
   u8 is_add;
 } vnet_lisp_add_del_adjacency_args_t;