X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fipip%2Fsixrd.c;h=492b4f8326043edbeda6c65e09763414d3535f40;hb=282872127bbeee6ae59ab3f885c09bad601ee0cc;hp=cc5bfa33d915ab3776a64fbfa9fc98b44cbe7ccc;hpb=b7b929931a07fbb27b43d5cd105f366c3e29807e;p=vpp.git

diff --git a/src/vnet/ipip/sixrd.c b/src/vnet/ipip/sixrd.c
index cc5bfa33d91..492b4f83260 100644
--- a/src/vnet/ipip/sixrd.c
+++ b/src/vnet/ipip/sixrd.c
@@ -34,6 +34,7 @@
 #include <vnet/adj/adj_midchain.h>
 #include <vnet/dpo/lookup_dpo.h>
 #include <vnet/fib/fib_table.h>
+#include <vnet/fib/fib_entry_track.h>
 #include <vnet/fib/ip6_fib.h>
 #include <vnet/plugin/plugin.h>
 
@@ -84,8 +85,8 @@ sixrd_adj_from_const_base (const adj_delegate_t * ad)
 }
 
 static void
-sixrd_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0,
-	     const void *data)
+sixrd_fixup (vlib_main_t * vm,
+	     const ip_adjacency_t * adj, vlib_buffer_t * b0, const void *data)
 {
   ip4_header_t *ip4 = vlib_buffer_get_current (b0);
   ip6_header_t *ip6 = vlib_buffer_get_current (b0) + sizeof (ip4_header_t);
@@ -98,8 +99,8 @@ sixrd_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0,
 }
 
 static void
-ip6ip_fixup (vlib_main_t * vm, ip_adjacency_t * adj, vlib_buffer_t * b0,
-	     const void *data)
+ip6ip_fixup (vlib_main_t * vm,
+	     const ip_adjacency_t * adj, vlib_buffer_t * b0, const void *data)
 {
   const ipip_tunnel_t *t = data;
   ip4_header_t *ip4 = vlib_buffer_get_current (b0);
@@ -152,9 +153,9 @@ ip6ip_tunnel_stack (adj_index_t ai, u32 fib_entry_index)
   if (vnet_hw_interface_get_flags (vnet_get_main (), t->hw_if_index) &
       VNET_HW_INTERFACE_FLAG_LINK_UP)
     {
-      adj_nbr_midchain_stack (ai,
-			      fib_entry_contribute_ip_forwarding
-			      (fib_entry_index));
+      adj_nbr_midchain_stack_on_fib_entry (ai,
+					   fib_entry_index,
+					   FIB_FORW_CHAIN_TYPE_UNICAST_IP4);
     }
   else
     {
@@ -227,12 +228,10 @@ sixrd_update_adj (vnet_main_t * vnm, u32 sw_if_index, adj_index_t ai)
 	  fib_node_init (&sixrd_ad->sixrd_node, sixrd_fib_node_type);
 	  sixrd_ad->adj_index = ai;
 	  sixrd_ad->sixrd_fib_entry_index =
-	    fib_table_entry_special_add (t->fib_index, &pfx, FIB_SOURCE_RR,
-					 FIB_ENTRY_FLAG_NONE);
-	  sixrd_ad->sixrd_sibling =
-	    fib_entry_child_add (sixrd_ad->sixrd_fib_entry_index,
-				 sixrd_fib_node_type,
-				 sixrd_ad - sixrd_adj_delegate_pool);
+	    fib_entry_track (t->fib_index, &pfx,
+			     sixrd_fib_node_type,
+			     sixrd_ad - sixrd_adj_delegate_pool,
+			     &sixrd_ad->sixrd_sibling);
 
 	  adj_delegate_add (adj, sixrd_adj_delegate_type,
 			    sixrd_ad - sixrd_adj_delegate_pool);
@@ -284,12 +283,10 @@ sixrd_add_tunnel (ip6_address_t * ip6_prefix, u8 ip6_prefix_len,
   ip46_address_t src = ip46_address_initializer, dst =
     ip46_address_initializer;
   ip_set (&src, ip4_src, true);
-  ipip_tunnel_key_t key = {
-    .transport = IPIP_TRANSPORT_IP4,
-    .fib_index = ip4_fib_index,
-    .src = src,
-    .dst = dst
-  };
+  ipip_tunnel_key_t key;
+
+  ipip_mk_key_i (IPIP_TRANSPORT_IP4, IPIP_MODE_6RD, &src, &dst, ip4_fib_index,
+		 &key);
 
   t = ipip_tunnel_db_find (&key);
   if (t)
@@ -378,6 +375,7 @@ sixrd_del_tunnel (u32 sw_if_index)
 {
   ipip_main_t *gm = &ipip_main;
   ipip_tunnel_t *t = ipip_tunnel_db_find_by_sw_if_index (sw_if_index);
+  ipip_tunnel_key_t key;
 
   if (!t)
     {
@@ -409,7 +407,8 @@ sixrd_del_tunnel (u32 sw_if_index)
   gm->tunnel_index_by_sw_if_index[t->sw_if_index] = ~0;
 
   vnet_delete_hw_interface (vnet_get_main (), t->hw_if_index);
-  ipip_tunnel_db_remove (t);
+  ipip_mk_key (t, &key);
+  ipip_tunnel_db_remove (t, &key);
   pool_put (gm->tunnels, t);
 
   return 0;
@@ -421,10 +420,8 @@ sixrd_adj_delegate_adj_deleted (adj_delegate_t * aed)
   sixrd_adj_delegate_t *sixrd_ad;
 
   sixrd_ad = sixrd_adj_from_base (aed);
-  fib_entry_child_remove (sixrd_ad->sixrd_fib_entry_index,
-			  sixrd_ad->sixrd_sibling);
-  fib_table_entry_delete_index (sixrd_ad->sixrd_fib_entry_index,
-				FIB_SOURCE_RR);
+  fib_entry_untrack (sixrd_ad->sixrd_fib_entry_index,
+		     sixrd_ad->sixrd_sibling);
   pool_put (sixrd_adj_delegate_pool, sixrd_ad);
 }