Remove unsed parameter from fib_table_entry_special_add() (only used in FIB tests). The DPO was incorrectly initialised with FIB_PROTO_MAX

Change-Id: I962df9e162e4dfb6837a5ce79ea795d5ff2d7315
Signed-off-by: Neale Ranns <nranns@cisco.com>

16 files changed, 30 insertions, 57 deletions

diff --git a/src/plugins/ila/ila.c b/src/plugins/ila/ila.c
index edbf3017f0f..fd56043eb57 100644
--- a/src/plugins/ila/ila.c
+++ b/src/plugins/ila/ila.c
@@ -736,8 +736,7 @@ ila_add_del_entry (ila_add_del_entry_args_t * args)
 	      fib_table_entry_special_add(0,
 					  &next_hop,
 					  FIB_SOURCE_RR,
-					  FIB_ENTRY_FLAG_NONE,
-					  ADJ_INDEX_INVALID);
+					  FIB_ENTRY_FLAG_NONE);
 	  e->next_hop_child_index =
 	      fib_entry_child_add(e->next_hop_fib_entry_index,
 				  ila_fib_node_type,
diff --git a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
index 6c04d9af210..67d461dbae0 100644
--- a/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
+++ b/src/plugins/ioam/lib-vxlan-gpe/vxlan_gpe_ioam.c
@@ -337,9 +337,7 @@ vxlan_gpe_enable_disable_ioam_for_dest (vlib_main_t * vm,
 	  t1->fib_entry_index =
 	    fib_table_entry_special_add (outer_fib_index,
 					 &tun_dst_pfx,
-					 FIB_SOURCE_RR,
-					 FIB_ENTRY_FLAG_NONE,
-					 ADJ_INDEX_INVALID);
+					 FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE);
 	  t1->sibling_index =
 	    fib_entry_child_add (t1->fib_entry_index,
 				 hm->fib_entry_type, t1 - hm->dst_tunnels);
diff --git a/src/plugins/lb/lb.c b/src/plugins/lb/lb.c
index add81236ae5..b1a47d0535c 100644
--- a/src/plugins/lb/lb.c
+++ b/src/plugins/lb/lb.c
@@ -510,8 +510,7 @@ next:
 	fib_table_entry_special_add(0,
 				    &nh,
 				    FIB_SOURCE_RR,
-				    FIB_ENTRY_FLAG_NONE,
-				    ADJ_INDEX_INVALID);
+				    FIB_ENTRY_FLAG_NONE);
     as->next_hop_child_index =
 	fib_entry_child_add(as->next_hop_fib_entry_index,
 			    lbm->fib_node_type,
diff --git a/src/vnet/dhcp/client.c b/src/vnet/dhcp/client.c
index 29749a33737..7c3f7f6abd6 100644
--- a/src/vnet/dhcp/client.c
+++ b/src/vnet/dhcp/client.c
@@ -781,8 +781,7 @@ int dhcp_client_add_del (dhcp_client_add_del_args_t * a)
 				      c->sw_if_index),
 				  &all_1s,
 				  FIB_SOURCE_DHCP,
-				  FIB_ENTRY_FLAG_LOCAL,
-				  ADJ_INDEX_INVALID);
+				  FIB_ENTRY_FLAG_LOCAL);
 
      /*
        * enable the interface to RX IPv4 packets
diff --git a/src/vnet/dhcp/dhcp4_proxy_node.c b/src/vnet/dhcp/dhcp4_proxy_node.c
index 1c84881a520..26e1e65cd4c 100644
--- a/src/vnet/dhcp/dhcp4_proxy_node.c
+++ b/src/vnet/dhcp/dhcp4_proxy_node.c
@@ -807,8 +807,7 @@ dhcp4_proxy_set_server (ip46_address_t *addr,
           fib_table_entry_special_add(rx_fib_index,
                                       &all_1s,
                                       FIB_SOURCE_DHCP,
-                                      FIB_ENTRY_FLAG_LOCAL,
-                                      ADJ_INDEX_INVALID);
+                                      FIB_ENTRY_FLAG_LOCAL);
           fib_table_lock (rx_fib_index, FIB_PROTOCOL_IP4);
       }
   }
diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c
index 3ed309f328b..e7338a8c56c 100644
--- a/src/vnet/fib/fib_path.c
+++ b/src/vnet/fib/fib_path.c
@@ -1557,8 +1557,7 @@ fib_path_resolve (fib_node_index_t path_index)
 	fei = fib_table_entry_special_add(path->recursive.fp_tbl_id,
 					  &pfx,
 					  FIB_SOURCE_RR,
-					  FIB_ENTRY_FLAG_NONE,
-					  ADJ_INDEX_INVALID);
+					  FIB_ENTRY_FLAG_NONE);
 
 	path = fib_path_get(path_index);
 	path->fp_via_fib = fei;
diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c
index 7818d02e05d..58f225f5b4b 100644
--- a/src/vnet/fib/fib_table.c
+++ b/src/vnet/fib/fib_table.c
@@ -369,23 +369,12 @@ fib_node_index_t
 fib_table_entry_special_add (u32 fib_index,
 			     const fib_prefix_t *prefix,
 			     fib_source_t source,
-			     fib_entry_flag_t flags,
-			     adj_index_t adj_index)
+			     fib_entry_flag_t flags)
 {
     fib_node_index_t fib_entry_index;
     dpo_id_t tmp_dpo = DPO_INVALID;
 
-    if (ADJ_INDEX_INVALID != adj_index)
-    {
-        dpo_set(&tmp_dpo,
-                DPO_ADJACENCY,
-                FIB_PROTOCOL_MAX,
-                adj_index);
-    }
-    else
-    {
-        dpo_copy(&tmp_dpo, drop_dpo_get(fib_proto_to_dpo(prefix->fp_proto)));
-    }
+    dpo_copy(&tmp_dpo, drop_dpo_get(fib_proto_to_dpo(prefix->fp_proto)));
  
     fib_entry_index = fib_table_entry_special_dpo_add(fib_index, prefix, source,
                                                       flags, &tmp_dpo);
diff --git a/src/vnet/fib/fib_table.h b/src/vnet/fib/fib_table.h
index e7e66acb773..994bc4eec1e 100644
--- a/src/vnet/fib/fib_table.h
+++ b/src/vnet/fib/fib_table.h
@@ -138,14 +138,16 @@ extern fib_node_index_t fib_table_get_less_specific(u32 fib_index,
 
 /**
  * @brief
- *  Add a 'special' entry to the FIB that links to the adj passed
+ *  Add a 'special' entry to the FIB.
  *  A special entry is an entry that the FIB is not expect to resolve
  *  via the usual mechanisms (i.e. recurisve or neighbour adj DB lookup).
- *  Instead the client/source provides the adj to link to.
+ *  Instead the will link to a DPO valid for the source and/or the flags.
  *  This add is reference counting per-source. So n 'removes' are required
  *  for n 'adds', if the entry is no longer required.
+ *  If the source needs to provide non-default forwarding use:
+ *  fib_table_entry_special_dpo_add()
  *
-  * @param fib_index
+ * @param fib_index
  *  The index of the FIB
  *
  * @param prefix
@@ -157,17 +159,13 @@ extern fib_node_index_t fib_table_get_less_specific(u32 fib_index,
  * @param flags
  *  Flags for the entry.
  *
- * @param adj_index
- *  The adjacency to link to.
- *
  * @return
  *  the index of the fib_entry_t that is created (or exists already).
  */
 extern fib_node_index_t fib_table_entry_special_add(u32 fib_index,
 						    const fib_prefix_t *prefix,
 						    fib_source_t source,
-						    fib_entry_flag_t flags,
-						    adj_index_t adj_index);
+						    fib_entry_flag_t flags);
 
 /**
  * @brief
diff --git a/src/vnet/fib/fib_test.c b/src/vnet/fib/fib_test.c
index 1a9cce241d5..eb6fe1617e7 100644
--- a/src/vnet/fib/fib_test.c
+++ b/src/vnet/fib/fib_test.c
@@ -1246,8 +1246,8 @@ fib_test_v4 (void)
 	     fib_entry_pool_size());
 
     /*
-     * An EXCLUSIVE route; one where the user (me) provides the exclusive
-     * adjacency through which the route will resovle
+     * An special route; one where the user (me) provides the
+     * adjacency through which the route will resovle by setting the flags
      */
     fib_prefix_t ex_pfx = {
 	.fp_len = 32,
@@ -1261,11 +1261,12 @@ fib_test_v4 (void)
     fib_table_entry_special_add(fib_index,
 				&ex_pfx,
 				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_EXCLUSIVE,
-				locked_ai);
+				FIB_ENTRY_FLAG_LOCAL);
     fei = fib_table_lookup_exact_match(fib_index, &ex_pfx);
-    FIB_TEST((ai == fib_entry_get_adj(fei)),
-	     "Exclusive route links to user adj");
+    dpo = fib_entry_contribute_ip_forwarding(fei);
+    dpo = load_balance_get_bucket(dpo->dpoi_index, 0);
+    FIB_TEST((DPO_RECEIVE == dpo->dpoi_type),
+	     "local interface adj is local");
 
     fib_table_entry_special_remove(fib_index,
 				   &ex_pfx,
@@ -3543,8 +3544,7 @@ fib_test_v4 (void)
     fei = fib_table_entry_special_add(fib_index,
 				      &pfx_4_1_1_1_s_32,
 				      FIB_SOURCE_URPF_EXEMPT,
-				      FIB_ENTRY_FLAG_DROP,
-				      ADJ_INDEX_INVALID);
+				      FIB_ENTRY_FLAG_DROP);
     dpo = fib_entry_contribute_ip_forwarding(fei);
     FIB_TEST(load_balance_is_drop(dpo),
 	     "uRPF exempt 4.1.1.1/32 DROP");
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c
index e8211c80d20..d0106541615 100644
--- a/src/vnet/fib/ip4_fib.c
+++ b/src/vnet/fib/ip4_fib.c
@@ -143,8 +143,7 @@ ip4_create_fib_with_table_id (u32 table_id)
 	fib_table_entry_special_add(fib_table->ft_index,
 				    &prefix,
 				    ip4_specials[ii].ift_source,
-				    ip4_specials[ii].ift_flag,
-				    ADJ_INDEX_INVALID);
+				    ip4_specials[ii].ift_flag);
     }
 
     return (fib_table->ft_index);
diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c
index 343ff55e80a..55acc694c9c 100644
--- a/src/vnet/fib/ip6_fib.c
+++ b/src/vnet/fib/ip6_fib.c
@@ -35,8 +35,7 @@ vnet_ip6_fib_init (u32 fib_index)
     fib_table_entry_special_add(fib_index,
 				&pfx,
 				FIB_SOURCE_DEFAULT_ROUTE,
-				FIB_ENTRY_FLAG_DROP,
-				ADJ_INDEX_INVALID);
+				FIB_ENTRY_FLAG_DROP);
 
     /*
      * all link local for us
@@ -47,8 +46,7 @@ vnet_ip6_fib_init (u32 fib_index)
     fib_table_entry_special_add(fib_index,
 				&pfx,
 				FIB_SOURCE_SPECIAL,
-				FIB_ENTRY_FLAG_LOCAL,
-				ADJ_INDEX_INVALID);
+				FIB_ENTRY_FLAG_LOCAL);
 }
 
 static u32
diff --git a/src/vnet/gre/interface.c b/src/vnet/gre/interface.c
index d4476ac4682..512e7db62fd 100644
--- a/src/vnet/gre/interface.c
+++ b/src/vnet/gre/interface.c
@@ -368,8 +368,7 @@ vnet_gre_tunnel_add (vnet_gre_add_del_tunnel_args_t *a,
       fib_table_entry_special_add(outer_fib_index,
                                   &tun_dst_pfx,
                                   FIB_SOURCE_RR,
-                                  FIB_ENTRY_FLAG_NONE,
-                                  ADJ_INDEX_INVALID);
+                                  FIB_ENTRY_FLAG_NONE);
   t->sibling_index =
       fib_entry_child_add(t->fib_entry_index,
                           FIB_NODE_TYPE_GRE_TUNNEL,
diff --git a/src/vnet/ip/ip4_source_check.c b/src/vnet/ip/ip4_source_check.c
index 3af32f2e13b..8af884047e1 100644
--- a/src/vnet/ip/ip4_source_check.c
+++ b/src/vnet/ip/ip4_source_check.c
@@ -524,7 +524,7 @@ ip_source_check_accept (vlib_main_t * vm,
       fib_table_entry_special_add (fib_index,
 				   &pfx,
 				   FIB_SOURCE_URPF_EXEMPT,
-				   FIB_ENTRY_FLAG_DROP, ADJ_INDEX_INVALID);
+				   FIB_ENTRY_FLAG_DROP);
     }
   else
     {
diff --git a/src/vnet/lisp-gpe/lisp_gpe_tunnel.c b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
index 444bfe14d2b..dd6c6fddfd9 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_tunnel.c
@@ -179,8 +179,7 @@ lisp_gpe_tunnel_find_or_create_and_lock (const locator_pair_t * pair,
       lgt->fib_entry_index = fib_table_entry_special_add (rloc_fib_index,
 							  &pfx,
 							  FIB_SOURCE_RR,
-							  FIB_ENTRY_FLAG_NONE,
-							  ADJ_INDEX_INVALID);
+							  FIB_ENTRY_FLAG_NONE);
 
       hash_set_mem (lisp_gpe_tunnel_db, &lgt->key,
 		    (lgt - lisp_gpe_tunnel_pool));
diff --git a/src/vnet/map/map.c b/src/vnet/map/map.c
index 99305afaf41..affee2dcac9 100644
--- a/src/vnet/map/map.c
+++ b/src/vnet/map/map.c
@@ -548,9 +548,7 @@ map_fib_resolve (map_main_pre_resolved_t * pr,
 
   pr->fei = fib_table_entry_special_add (0,	// default fib
 					 &pfx,
-					 FIB_SOURCE_RR,
-					 FIB_ENTRY_FLAG_NONE,
-					 ADJ_INDEX_INVALID);
+					 FIB_SOURCE_RR, FIB_ENTRY_FLAG_NONE);
   pr->sibling = fib_entry_child_add (pr->fei, FIB_NODE_TYPE_MAP_E, proto);
   map_stack (pr);
 }
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index 58c7becb5d7..c8a050d9959 100644
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -486,7 +486,7 @@ int vnet_vxlan_add_del_tunnel
           vtep_addr_ref(&t->src);
           t->fib_entry_index = fib_table_entry_special_add
             (t->encap_fib_index, &tun_dst_pfx, FIB_SOURCE_RR,
-	     FIB_ENTRY_FLAG_NONE, ADJ_INDEX_INVALID);
+	     FIB_ENTRY_FLAG_NONE);
           t->sibling_index = fib_entry_child_add
             (t->fib_entry_index, FIB_NODE_TYPE_VXLAN_TUNNEL, t - vxm->tunnels);
           vxlan_tunnel_restack_dpo(t);