X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fgre%2Finterface.c;h=553c89aeb514fc34375b72506a26e3a5ed7fecf2;hb=e5b94dded;hp=0822cd74b525577327438c59aad04c904707ee5e;hpb=d723161e038d00e59766aa67a6a0dcc350227e4b;p=vpp.git

diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c
index 0822cd74b52..553c89aeb51 100644
--- a/src/vnet/gre/interface.c
+++ b/src/vnet/gre/interface.c
@@ -24,8 +24,25 @@
 #include <vnet/adj/adj_midchain.h>
 #include <vnet/adj/adj_nbr.h>
 #include <vnet/mpls/mpls.h>
+#include <vnet/l2/l2_input.h>
+#include <vnet/nhrp/nhrp.h>
 
-static const char *gre_tunnel_type_names[] = GRE_TUNNEL_TYPE_NAMES;
+u8 *
+format_gre_tunnel_type (u8 * s, va_list * args)
+{
+  gre_tunnel_type_t type = va_arg (*args, int);
+
+  switch (type)
+    {
+#define _(n, v) case GRE_TUNNEL_TYPE_##n:       \
+      s = format (s, "%s", v);                  \
+      break;
+      foreach_gre_tunnel_type
+#undef _
+    }
+
+  return (s);
+}
 
 static u8 *
 format_gre_tunnel (u8 * s, va_list * args)
@@ -38,7 +55,8 @@ format_gre_tunnel (u8 * s, va_list * args)
 	      format_ip46_address, &t->tunnel_dst.fp_addr, IP46_TYPE_ANY,
 	      t->outer_fib_index, t->sw_if_index);
 
-  s = format (s, "payload %s ", gre_tunnel_type_names[t->type]);
+  s = format (s, "payload %U ", format_gre_tunnel_type, t->type);
+  s = format (s, "%U ", format_tunnel_mode, t->mode);
 
   if (t->type == GRE_TUNNEL_TYPE_ERSPAN)
     s = format (s, "session %d ", t->session_id);
@@ -50,7 +68,7 @@ format_gre_tunnel (u8 * s, va_list * args)
 }
 
 static gre_tunnel_t *
-gre_tunnel_db_find (const vnet_gre_add_del_tunnel_args_t * a,
+gre_tunnel_db_find (const vnet_gre_tunnel_add_del_args_t * a,
 		    u32 outer_fib_index, gre_tunnel_key_t * key)
 {
   gre_main_t *gm = &gre_main;
@@ -59,13 +77,13 @@ gre_tunnel_db_find (const vnet_gre_add_del_tunnel_args_t * a,
   if (!a->is_ipv6)
     {
       gre_mk_key4 (a->src.ip4, a->dst.ip4, outer_fib_index,
-		   a->tunnel_type, a->session_id, &key->gtk_v4);
+		   a->type, a->mode, a->session_id, &key->gtk_v4);
       p = hash_get_mem (gm->tunnel_by_key4, &key->gtk_v4);
     }
   else
     {
       gre_mk_key6 (&a->src.ip6, &a->dst.ip6, outer_fib_index,
-		   a->tunnel_type, a->session_id, &key->gtk_v6);
+		   a->type, a->mode, a->session_id, &key->gtk_v6);
       p = hash_get_mem (gm->tunnel_by_key6, &key->gtk_v6);
     }
 
@@ -80,43 +98,29 @@ gre_tunnel_db_add (gre_tunnel_t * t, gre_tunnel_key_t * key)
 {
   gre_main_t *gm = &gre_main;
 
-  t->key = clib_mem_alloc (sizeof (*t->key));
-  clib_memcpy (t->key, key, sizeof (*key));
-
   if (t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6)
     {
-      hash_set_mem (gm->tunnel_by_key6, &t->key->gtk_v6, t->dev_instance);
+      hash_set_mem_alloc (&gm->tunnel_by_key6, &key->gtk_v6, t->dev_instance);
     }
   else
     {
-      hash_set_mem (gm->tunnel_by_key4, &t->key->gtk_v4, t->dev_instance);
+      hash_set_mem_alloc (&gm->tunnel_by_key4, &key->gtk_v4, t->dev_instance);
     }
 }
 
 static void
-gre_tunnel_db_remove (gre_tunnel_t * t)
+gre_tunnel_db_remove (gre_tunnel_t * t, gre_tunnel_key_t * key)
 {
   gre_main_t *gm = &gre_main;
 
   if (t->tunnel_dst.fp_proto == FIB_PROTOCOL_IP6)
     {
-      hash_unset_mem (gm->tunnel_by_key6, &t->key->gtk_v6);
+      hash_unset_mem_free (&gm->tunnel_by_key6, &key->gtk_v6);
     }
   else
     {
-      hash_unset_mem (gm->tunnel_by_key4, &t->key->gtk_v4);
+      hash_unset_mem_free (&gm->tunnel_by_key4, &key->gtk_v4);
     }
-
-  clib_mem_free (t->key);
-  t->key = NULL;
-}
-
-static gre_tunnel_t *
-gre_tunnel_from_fib_node (fib_node_t * node)
-{
-  ASSERT (FIB_NODE_TYPE_GRE_TUNNEL == node->fn_type);
-  return ((gre_tunnel_t *) (((char *) node) -
-			    STRUCT_OFFSET_OF (gre_tunnel_t, node)));
 }
 
 /**
@@ -135,7 +139,7 @@ gre_tunnel_stack (adj_index_t ai)
   adj = adj_get (ai);
   sw_if_index = adj->rewrite_header.sw_if_index;
 
-  if ((vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index) ||
+  if ((vec_len (gm->tunnel_index_by_sw_if_index) <= sw_if_index) ||
       (~0 == gm->tunnel_index_by_sw_if_index[sw_if_index]))
     return;
 
@@ -145,45 +149,12 @@ gre_tunnel_stack (adj_index_t ai)
   if ((vnet_hw_interface_get_flags (vnet_get_main (), gt->hw_if_index) &
        VNET_HW_INTERFACE_FLAG_LINK_UP) == 0)
     {
-      adj_nbr_midchain_unstack (ai);
-      return;
+      adj_midchain_delegate_unstack (ai);
     }
-
-  dpo_id_t tmp = DPO_INVALID;
-  fib_forward_chain_type_t fib_fwd = (FIB_PROTOCOL_IP6 == adj->ia_nh_proto) ?
-    FIB_FORW_CHAIN_TYPE_UNICAST_IP6 : FIB_FORW_CHAIN_TYPE_UNICAST_IP4;
-
-  fib_entry_contribute_forwarding (gt->fib_entry_index, fib_fwd, &tmp);
-  if (DPO_LOAD_BALANCE == tmp.dpoi_type)
+  else
     {
-      /*
-       * post GRE rewrite we will load-balance. However, the GRE encap
-       * is always the same for this adjacency/tunnel and hence the IP/GRE
-       * src,dst hash is always the same result too. So we do that hash now and
-       * stack on the choice.
-       * If the choice is an incomplete adj then we will need a poke when
-       * it becomes complete. This happens since the adj update walk propagates
-       * as far a recursive paths.
-       */
-      const dpo_id_t *choice;
-      load_balance_t *lb;
-      int hash;
-
-      lb = load_balance_get (tmp.dpoi_index);
-
-      if (fib_fwd == FIB_FORW_CHAIN_TYPE_UNICAST_IP4)
-	hash = ip4_compute_flow_hash ((ip4_header_t *) adj_get_rewrite (ai),
-				      lb->lb_hash_config);
-      else
-	hash = ip6_compute_flow_hash ((ip6_header_t *) adj_get_rewrite (ai),
-				      lb->lb_hash_config);
-      choice =
-	load_balance_get_bucket_i (lb, hash & lb->lb_n_buckets_minus_1);
-      dpo_copy (&tmp, choice);
+      adj_midchain_delegate_stack (ai, gt->outer_fib_index, &gt->tunnel_dst);
     }
-
-  adj_nbr_midchain_stack (ai, &tmp);
-  dpo_reset (&tmp);
 }
 
 /**
@@ -211,57 +182,133 @@ gre_tunnel_restack (gre_tunnel_t * gt)
   }
 }
 
-/**
- * Function definition to backwalk a FIB node
- */
-static fib_node_back_walk_rc_t
-gre_tunnel_back_walk (fib_node_t * node, fib_node_back_walk_ctx_t * ctx)
+static void
+gre_nhrp_mk_key (const gre_tunnel_t * t,
+		 const nhrp_entry_t * ne, gre_tunnel_key_t * key)
 {
-  gre_tunnel_restack (gre_tunnel_from_fib_node (node));
+  const fib_prefix_t *nh;
 
-  return (FIB_NODE_BACK_WALK_CONTINUE);
+  nh = nhrp_entry_get_nh (ne);
+
+  /* construct the key using mode P2P so it can be found in the DP */
+  if (FIB_PROTOCOL_IP4 == nh->fp_proto)
+    gre_mk_key4 (t->tunnel_src.ip4,
+		 nh->fp_addr.ip4,
+		 nhrp_entry_get_fib_index (ne),
+		 t->type, TUNNEL_MODE_P2P, 0, &key->gtk_v4);
+  else
+    gre_mk_key6 (&t->tunnel_src.ip6,
+		 &nh->fp_addr.ip6,
+		 nhrp_entry_get_fib_index (ne),
+		 t->type, TUNNEL_MODE_P2P, 0, &key->gtk_v6);
 }
 
 /**
- * Function definition to get a FIB node from its index
+ * An NHRP entry has been added
  */
-static fib_node_t *
-gre_tunnel_fib_node_get (fib_node_index_t index)
+static void
+gre_nhrp_entry_added (const nhrp_entry_t * ne)
 {
-  gre_tunnel_t *gt;
-  gre_main_t *gm;
+  gre_main_t *gm = &gre_main;
+  const ip46_address_t *nh;
+  gre_tunnel_key_t key;
+  gre_tunnel_t *t;
+  u32 sw_if_index;
+  u32 t_idx;
+
+  sw_if_index = nhrp_entry_get_sw_if_index (ne);
+  if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index)
+    return;
+
+  t_idx = gm->tunnel_index_by_sw_if_index[sw_if_index];
+
+  if (INDEX_INVALID == t_idx)
+    return;
+
+  /* entry has been added on an interface for which there is a GRE tunnel */
+  t = pool_elt_at_index (gm->tunnels, t_idx);
 
-  gm = &gre_main;
-  gt = pool_elt_at_index (gm->tunnels, index);
+  if (t->mode != TUNNEL_MODE_MP)
+    return;
+
+  /* the next-hop (underlay) of the NHRP entry will form part of the key for
+   * ingress lookup to match packets to this interface */
+  gre_nhrp_mk_key (t, ne, &key);
+  gre_tunnel_db_add (t, &key);
 
-  return (&gt->node);
+  /* update the rewrites for each of the adjacencies for this peer (overlay)
+   * using  the next-hop (underlay) */
+  mgre_walk_ctx_t ctx = {
+    .t = t,
+    .ne = ne
+  };
+  nh = nhrp_entry_get_peer (ne);
+  adj_nbr_walk_nh (nhrp_entry_get_sw_if_index (ne),
+		   (ip46_address_is_ip4 (nh) ?
+		    FIB_PROTOCOL_IP4 :
+		    FIB_PROTOCOL_IP6), nh, mgre_mk_complete_walk, &ctx);
 }
 
-/**
- * Function definition to inform the FIB node that its last lock has gone.
- */
 static void
-gre_tunnel_last_lock_gone (fib_node_t * node)
+gre_nhrp_entry_deleted (const nhrp_entry_t * ne)
 {
-  /*
-   * The MPLS GRE tunnel is a root of the graph. As such
-   * it never has children and thus is never locked.
-   */
-  ASSERT (0);
+  gre_main_t *gm = &gre_main;
+  const ip46_address_t *nh;
+  gre_tunnel_key_t key;
+  gre_tunnel_t *t;
+  u32 sw_if_index;
+  u32 t_idx;
+
+  sw_if_index = nhrp_entry_get_sw_if_index (ne);
+  if (vec_len (gm->tunnel_index_by_sw_if_index) < sw_if_index)
+    return;
+
+  t_idx = gm->tunnel_index_by_sw_if_index[sw_if_index];
+
+  if (INDEX_INVALID == t_idx)
+    return;
+
+  t = pool_elt_at_index (gm->tunnels, t_idx);
+
+  /* remove the next-hop as an ingress lookup key */
+  gre_nhrp_mk_key (t, ne, &key);
+  gre_tunnel_db_remove (t, &key);
+
+  nh = nhrp_entry_get_peer (ne);
+
+  /* make all the adjacencies incomplete */
+  adj_nbr_walk_nh (nhrp_entry_get_sw_if_index (ne),
+		   (ip46_address_is_ip4 (nh) ?
+		    FIB_PROTOCOL_IP4 :
+		    FIB_PROTOCOL_IP6), nh, mgre_mk_incomplete_walk, t);
 }
 
-/*
- * Virtual function table registered by MPLS GRE tunnels
- * for participation in the FIB object graph.
- */
-const static fib_node_vft_t gre_vft = {
-  .fnv_get = gre_tunnel_fib_node_get,
-  .fnv_last_lock = gre_tunnel_last_lock_gone,
-  .fnv_back_walk = gre_tunnel_back_walk,
-};
+static walk_rc_t
+gre_tunnel_delete_nhrp_walk (index_t nei, void *ctx)
+{
+  gre_tunnel_t *t = ctx;
+  gre_tunnel_key_t key;
+
+  gre_nhrp_mk_key (t, nhrp_entry_get (nei), &key);
+  gre_tunnel_db_remove (t, &key);
+
+  return (WALK_CONTINUE);
+}
+
+static walk_rc_t
+gre_tunnel_add_nhrp_walk (index_t nei, void *ctx)
+{
+  gre_tunnel_t *t = ctx;
+  gre_tunnel_key_t key;
+
+  gre_nhrp_mk_key (t, nhrp_entry_get (nei), &key);
+  gre_tunnel_db_add (t, &key);
+
+  return (WALK_CONTINUE);
+}
 
 static int
-vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
+vnet_gre_tunnel_add (vnet_gre_tunnel_add_del_args_t * a,
 		     u32 outer_fib_index, u32 * sw_if_indexp)
 {
   gre_main_t *gm = &gre_main;
@@ -280,7 +327,7 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
     return VNET_API_ERROR_IF_ALREADY_EXISTS;
 
   pool_get_aligned (gm->tunnels, t, CLIB_CACHE_LINE_BYTES);
-  memset (t, 0, sizeof (*t));
+  clib_memset (t, 0, sizeof (*t));
 
   /* Reconcile the real dev_instance and a possible requested instance */
   u32 t_idx = t - gm->tunnels;	/* tunnel index (or instance) */
@@ -296,16 +343,24 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
 
   t->dev_instance = t_idx;	/* actual */
   t->user_instance = u_idx;	/* name */
-  fib_node_init (&t->node, FIB_NODE_TYPE_GRE_TUNNEL);
 
-  t->type = a->tunnel_type;
+  t->type = a->type;
+  t->mode = a->mode;
+  t->flags = a->flags;
   if (t->type == GRE_TUNNEL_TYPE_ERSPAN)
     t->session_id = a->session_id;
 
   if (t->type == GRE_TUNNEL_TYPE_L3)
-    hw_if_index = vnet_register_interface (vnm, gre_device_class.index, t_idx,
-					   gre_hw_interface_class.index,
-					   t_idx);
+    {
+      if (t->mode == TUNNEL_MODE_P2P)
+	hw_if_index =
+	  vnet_register_interface (vnm, gre_device_class.index, t_idx,
+				   gre_hw_interface_class.index, t_idx);
+      else
+	hw_if_index =
+	  vnet_register_interface (vnm, gre_device_class.index, t_idx,
+				   mgre_hw_interface_class.index, t_idx);
+    }
   else
     {
       /* Default MAC address (d00b:eed0:0000 + sw_if_index) */
@@ -364,6 +419,10 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
   t->tunnel_dst.fp_addr = a->dst;
 
   gre_tunnel_db_add (t, &key);
+
+  if (t->mode == TUNNEL_MODE_MP)
+    nhrp_walk_itf (t->sw_if_index, gre_tunnel_add_nhrp_walk, t);
+
   if (t->type == GRE_TUNNEL_TYPE_ERSPAN)
     {
       gre_sn_key_t skey;
@@ -386,11 +445,6 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
 	}
     }
 
-  t->fib_entry_index = fib_table_entry_special_add
-    (outer_fib_index, &t->tunnel_dst, FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE);
-  t->sibling_index = fib_entry_child_add
-    (t->fib_entry_index, FIB_NODE_TYPE_GRE_TUNNEL, t_idx);
-
   if (t->type != GRE_TUNNEL_TYPE_L3)
     {
       t->l2_adj_index = adj_nbr_add_or_lock
@@ -401,11 +455,15 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t * a,
   if (sw_if_indexp)
     *sw_if_indexp = sw_if_index;
 
+  /* register gre46-input nodes */
+  ip4_register_protocol (IP_PROTOCOL_GRE, gre4_input_node.index);
+  ip6_register_protocol (IP_PROTOCOL_GRE, gre6_input_node.index);
+
   return 0;
 }
 
 static int
-vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a,
+vnet_gre_tunnel_delete (vnet_gre_tunnel_add_del_args_t * a,
 			u32 outer_fib_index, u32 * sw_if_indexp)
 {
   gre_main_t *gm = &gre_main;
@@ -418,11 +476,15 @@ vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a,
   if (NULL == t)
     return VNET_API_ERROR_NO_SUCH_ENTRY;
 
+  if (t->mode == TUNNEL_MODE_MP)
+    nhrp_walk_itf (t->sw_if_index, gre_tunnel_delete_nhrp_walk, t);
+
   sw_if_index = t->sw_if_index;
   vnet_sw_interface_set_flags (vnm, sw_if_index, 0 /* down */ );
 
   /* make sure tunnel is removed from l2 bd or xconnect */
-  set_int_l2_mode (gm->vlib_main, vnm, MODE_L3, sw_if_index, 0, 0, 0, 0);
+  set_int_l2_mode (gm->vlib_main, vnm, MODE_L3, sw_if_index, 0,
+		   L2_BD_PORT_TYPE_NORMAL, 0, 0);
   gm->tunnel_index_by_sw_if_index[sw_if_index] = ~0;
 
   if (t->type == GRE_TUNNEL_TYPE_L3)
@@ -431,10 +493,10 @@ vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a,
     ethernet_delete_interface (vnm, t->hw_if_index);
 
   if (t->l2_adj_index != ADJ_INDEX_INVALID)
-    adj_unlock (t->l2_adj_index);
-
-  fib_entry_child_remove (t->fib_entry_index, t->sibling_index);
-  fib_table_entry_delete_index (t->fib_entry_index, FIB_SOURCE_RR);
+    {
+      adj_midchain_delegate_unstack (t->l2_adj_index);
+      adj_unlock (t->l2_adj_index);
+    }
 
   ASSERT ((t->type != GRE_TUNNEL_TYPE_ERSPAN) || (t->gre_sn != NULL));
   if ((t->type == GRE_TUNNEL_TYPE_ERSPAN) && (t->gre_sn->ref_count-- == 1))
@@ -446,8 +508,7 @@ vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a,
     }
 
   hash_unset (gm->instance_used, t->user_instance);
-  gre_tunnel_db_remove (t);
-  fib_node_deinit (&t->node);
+  gre_tunnel_db_remove (t, &key);
   pool_put (gm->tunnels, t);
 
   if (sw_if_indexp)
@@ -457,15 +518,15 @@ vnet_gre_tunnel_delete (vnet_gre_add_del_tunnel_args_t * a,
 }
 
 int
-vnet_gre_add_del_tunnel (vnet_gre_add_del_tunnel_args_t * a,
+vnet_gre_tunnel_add_del (vnet_gre_tunnel_add_del_args_t * a,
 			 u32 * sw_if_indexp)
 {
   u32 outer_fib_index;
 
   if (!a->is_ipv6)
-    outer_fib_index = ip4_fib_index_from_table_id (a->outer_fib_id);
+    outer_fib_index = ip4_fib_index_from_table_id (a->outer_table_id);
   else
-    outer_fib_index = ip6_fib_index_from_table_id (a->outer_fib_id);
+    outer_fib_index = ip6_fib_index_from_table_id (a->outer_table_id);
 
   if (~0 == outer_fib_index)
     return VNET_API_ERROR_NO_SUCH_FIB;
@@ -473,6 +534,9 @@ vnet_gre_add_del_tunnel (vnet_gre_add_del_tunnel_args_t * a,
   if (a->session_id > GTK_SESSION_ID_MAX)
     return VNET_API_ERROR_INVALID_SESSION_ID;
 
+  if (a->mode == TUNNEL_MODE_MP && !ip46_address_is_zero (&a->dst))
+    return (VNET_API_ERROR_INVALID_DST_ADDRESS);
+
   if (a->is_add)
     return (vnet_gre_tunnel_add (a, outer_fib_index, sw_if_indexp));
   else
@@ -518,19 +582,18 @@ create_gre_tunnel_command_fn (vlib_main_t * vm,
 			      vlib_cli_command_t * cmd)
 {
   unformat_input_t _line_input, *line_input = &_line_input;
-  vnet_gre_add_del_tunnel_args_t _a, *a = &_a;
-  ip46_address_t src, dst;
+  vnet_gre_tunnel_add_del_args_t _a, *a = &_a;
+  ip46_address_t src = ip46_address_initializer, dst =
+    ip46_address_initializer;
   u32 instance = ~0;
-  u32 outer_fib_id = 0;
+  u32 outer_table_id = 0;
   gre_tunnel_type_t t_type = GRE_TUNNEL_TYPE_L3;
+  tunnel_mode_t t_mode = TUNNEL_MODE_P2P;
   u32 session_id = 0;
   int rv;
-  u32 num_m_args = 0;
   u8 is_add = 1;
   u32 sw_if_index;
   clib_error_t *error = NULL;
-  u8 ipv4_set = 0;
-  u8 ipv6_set = 0;
 
   /* Get a line of input. */
   if (!unformat_user (input, unformat_line_input, line_input))
@@ -542,32 +605,14 @@ create_gre_tunnel_command_fn (vlib_main_t * vm,
 	is_add = 0;
       else if (unformat (line_input, "instance %d", &instance))
 	;
-      else
-	if (unformat (line_input, "src %U", unformat_ip4_address, &src.ip4))
-	{
-	  num_m_args++;
-	  ipv4_set = 1;
-	}
-      else
-	if (unformat (line_input, "dst %U", unformat_ip4_address, &dst.ip4))
-	{
-	  num_m_args++;
-	  ipv4_set = 1;
-	}
-      else
-	if (unformat (line_input, "src %U", unformat_ip6_address, &src.ip6))
-	{
-	  num_m_args++;
-	  ipv6_set = 1;
-	}
-      else
-	if (unformat (line_input, "dst %U", unformat_ip6_address, &dst.ip6))
-	{
-	  num_m_args++;
-	  ipv6_set = 1;
-	}
-      else if (unformat (line_input, "outer-fib-id %d", &outer_fib_id))
+      else if (unformat (line_input, "src %U", unformat_ip46_address, &src))
 	;
+      else if (unformat (line_input, "dst %U", unformat_ip46_address, &dst))
+	;
+      else if (unformat (line_input, "outer-table-id %d", &outer_table_id))
+	;
+      else if (unformat (line_input, "multipoint"))
+	t_mode = TUNNEL_MODE_MP;
       else if (unformat (line_input, "teb"))
 	t_type = GRE_TUNNEL_TYPE_TEB;
       else if (unformat (line_input, "erspan %d", &session_id))
@@ -580,49 +625,43 @@ create_gre_tunnel_command_fn (vlib_main_t * vm,
 	}
     }
 
-  if (num_m_args < 2)
+  if (ip46_address_is_equal (&src, &dst))
     {
-      error = clib_error_return (0, "mandatory argument(s) missing");
+      error = clib_error_return (0, "src and dst are identical");
       goto done;
     }
 
-  if ((ipv4_set && memcmp (&src.ip4, &dst.ip4, sizeof (src.ip4)) == 0) ||
-      (ipv6_set && memcmp (&src.ip6, &dst.ip6, sizeof (src.ip6)) == 0))
+  if (t_mode != TUNNEL_MODE_MP && ip46_address_is_zero (&dst))
     {
-      error = clib_error_return (0, "src and dst are identical");
+      error = clib_error_return (0, "destination address not specified");
       goto done;
     }
 
-  if (ipv4_set && ipv6_set)
-    return clib_error_return (0, "both IPv4 and IPv6 addresses specified");
+  if (ip46_address_is_zero (&src))
+    {
+      error = clib_error_return (0, "source address not specified");
+      goto done;
+    }
 
-  if ((ipv4_set && memcmp (&dst.ip4, &zero_addr.ip4, sizeof (dst.ip4)) == 0)
-      || (ipv6_set
-	  && memcmp (&dst.ip6, &zero_addr.ip6, sizeof (dst.ip6)) == 0))
+  if (ip46_address_is_ip4 (&src) != ip46_address_is_ip4 (&dst))
     {
-      error = clib_error_return (0, "dst address cannot be zero");
+      error =
+	clib_error_return (0, "src and dst address must be the same AF");
       goto done;
     }
 
-  memset (a, 0, sizeof (*a));
+  clib_memset (a, 0, sizeof (*a));
   a->is_add = is_add;
-  a->outer_fib_id = outer_fib_id;
-  a->tunnel_type = t_type;
+  a->outer_table_id = outer_table_id;
+  a->type = t_type;
+  a->mode = t_mode;
   a->session_id = session_id;
-  a->is_ipv6 = ipv6_set;
+  a->is_ipv6 = !ip46_address_is_ip4 (&src);
   a->instance = instance;
-  if (!ipv6_set)
-    {
-      clib_memcpy (&a->src.ip4, &src.ip4, sizeof (src.ip4));
-      clib_memcpy (&a->dst.ip4, &dst.ip4, sizeof (dst.ip4));
-    }
-  else
-    {
-      clib_memcpy (&a->src.ip6, &src.ip6, sizeof (src.ip6));
-      clib_memcpy (&a->dst.ip6, &dst.ip6, sizeof (dst.ip6));
-    }
+  clib_memcpy (&a->src, &src, sizeof (a->src));
+  clib_memcpy (&a->dst, &dst, sizeof (a->dst));
 
-  rv = vnet_gre_add_del_tunnel (a, &sw_if_index);
+  rv = vnet_gre_tunnel_add_del (a, &sw_if_index);
 
   switch (rv)
     {
@@ -634,8 +673,8 @@ create_gre_tunnel_command_fn (vlib_main_t * vm,
       error = clib_error_return (0, "GRE tunnel already exists...");
       goto done;
     case VNET_API_ERROR_NO_SUCH_FIB:
-      error = clib_error_return (0, "outer fib ID %d doesn't exist\n",
-				 outer_fib_id);
+      error = clib_error_return (0, "outer table ID %d doesn't exist\n",
+				 outer_table_id);
       goto done;
     case VNET_API_ERROR_NO_SUCH_ENTRY:
       error = clib_error_return (0, "GRE tunnel doesn't exist");
@@ -649,7 +688,7 @@ create_gre_tunnel_command_fn (vlib_main_t * vm,
       goto done;
     default:
       error =
-	clib_error_return (0, "vnet_gre_add_del_tunnel returned %d", rv);
+	clib_error_return (0, "vnet_gre_tunnel_add_del returned %d", rv);
       goto done;
     }
 
@@ -714,13 +753,18 @@ VLIB_CLI_COMMAND (show_gre_tunnel_command, static) = {
 };
 /* *INDENT-ON* */
 
+const static nhrp_vft_t gre_nhrp_vft = {
+  .nv_added = gre_nhrp_entry_added,
+  .nv_deleted = gre_nhrp_entry_deleted,
+};
+
 /* force inclusion from application's main.c */
 clib_error_t *
 gre_interface_init (vlib_main_t * vm)
 {
-  fib_node_register_type (FIB_NODE_TYPE_GRE_TUNNEL, &gre_vft);
+  nhrp_register (&gre_nhrp_vft);
 
-  return 0;
+  return (NULL);
 }
 
 VLIB_INIT_FUNCTION (gre_interface_init);