X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_entry_src_interface.c;h=402369d1dfc869c7251f718fa0b6b5cc1101eb67;hb=e2fe09742;hp=f79be72c45a037ed8e34f6a0d2d66d16140c2f01;hpb=89541992000433b743cbbe8cb396faab42bcf6ae;p=vpp.git

diff --git a/src/vnet/fib/fib_entry_src_interface.c b/src/vnet/fib/fib_entry_src_interface.c
index f79be72c45a..402369d1dfc 100644
--- a/src/vnet/fib/fib_entry_src_interface.c
+++ b/src/vnet/fib/fib_entry_src_interface.c
@@ -27,8 +27,8 @@
 static void
 fib_entry_src_interface_init (fib_entry_src_t *src)
 {
-    src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
-    src->interface.fesi_sibling = FIB_NODE_INDEX_INVALID;
+    src->u.interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+    src->u.interface.fesi_sibling = FIB_NODE_INDEX_INVALID;
 }
 
 static void
@@ -48,37 +48,72 @@ static void
 fib_entry_src_interface_remove (fib_entry_src_t *src)
 {
     src->fes_pl = FIB_NODE_INDEX_INVALID;
+    ASSERT(src->u.interface.fesi_sibling == ~0);
 }
 
-static void
-fib_entry_src_interface_path_swap (fib_entry_src_t *src,
-				   const fib_entry_t *entry,
-				   fib_path_list_flags_t pl_flags,
-				   const fib_route_path_t *paths)
+static int
+fib_entry_src_interface_update_glean (fib_entry_t *cover,
+                                      const fib_entry_t *local)
 {
-    ip_adjacency_t *adj;
+    fib_entry_src_t *src;
+    adj_index_t ai;
 
-    src->fes_pl = fib_path_list_create(pl_flags, paths);
+    src = fib_entry_src_find (cover, FIB_SOURCE_INTERFACE);
 
-    /*
-     * this is a hack to get the entry's prefix into the glean adjacnecy
-     * so that it is available for fast retreival in the switch path.
-     */
-    if (!(FIB_ENTRY_FLAG_LOCAL & src->fes_entry_flags))
+    if (NULL == src)
     {
-        adj = adj_get(fib_path_list_get_adj(
-			  src->fes_pl,
-			  fib_entry_get_default_chain_type(entry)));
+        /*
+         * The cover is not an interface source, no work
+         */
+        return 0;
+    }
 
-	if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
+    ai = fib_path_list_get_adj(src->fes_pl,
+                               fib_entry_get_default_chain_type(cover));
+
+    if (INDEX_INVALID != ai)
+    {
+        ip_adjacency_t *adj;
+
+        adj = adj_get(ai);
+
+        if (IP_LOOKUP_NEXT_GLEAN == adj->lookup_next_index)
         {
             /*
              * the connected prefix will link to a glean on a non-p2p
              * interface.
+             * Ensure we are updating with a host in the connected's subnet
              */
-            adj->sub_type.glean.receive_addr = entry->fe_prefix.fp_addr;
+            if (fib_prefix_is_cover(&adj->sub_type.glean.rx_pfx,
+                                    &local->fe_prefix))
+            {
+                adj->sub_type.glean.rx_pfx.fp_addr = local->fe_prefix.fp_addr;
+                return (1);
+            }
         }
     }
+
+    return (0);
+}
+
+static walk_rc_t
+fib_entry_src_interface_update_glean_walk (fib_entry_t *cover,
+                                           fib_node_index_t covered,
+                                           void *ctx)
+{
+    if (fib_entry_src_interface_update_glean(cover, fib_entry_get(covered)))
+        return (WALK_STOP);
+
+    return (WALK_CONTINUE);
+}
+
+static void
+fib_entry_src_interface_path_swap (fib_entry_src_t *src,
+				   const fib_entry_t *entry,
+				   fib_path_list_flags_t pl_flags,
+				   const fib_route_path_t *paths)
+{
+    src->fes_pl = fib_path_list_create(pl_flags, paths);
 }
 
 /*
@@ -98,16 +133,18 @@ fib_entry_src_interface_activate (fib_entry_src_t *src,
 	 * during an attached export of the cover, this local prefix is
 	 * also exported
 	 */
-	src->interface.fesi_cover =
+	src->u.interface.fesi_cover =
 	    fib_table_get_less_specific(fib_entry->fe_fib_index,
 					&fib_entry->fe_prefix);
 
-	ASSERT(FIB_NODE_INDEX_INVALID != src->interface.fesi_cover);
+	ASSERT(FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover);
 
-	cover = fib_entry_get(src->interface.fesi_cover);
+	cover = fib_entry_get(src->u.interface.fesi_cover);
 
-	src->interface.fesi_sibling =
+	src->u.interface.fesi_sibling =
 	    fib_entry_cover_track(cover, fib_entry_get_index(fib_entry));
+
+        fib_entry_src_interface_update_glean(cover, fib_entry);
     }
 
     return (!0);
@@ -125,15 +162,20 @@ fib_entry_src_interface_deactivate (fib_entry_src_t *src,
     fib_entry_t *cover;
 
     /*
-     * remove the depednecy on the covering entry
+     * remove the dependency on the covering entry
      */
-    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
+    if (FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover)
     {
-	cover = fib_entry_get(src->interface.fesi_cover);
+	cover = fib_entry_get(src->u.interface.fesi_cover);
+
+	fib_entry_cover_untrack(cover, src->u.interface.fesi_sibling);
 
-	fib_entry_cover_untrack(cover, src->interface.fesi_sibling);
+	src->u.interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+	src->u.interface.fesi_sibling = ~0;
 
-	src->interface.fesi_cover = FIB_NODE_INDEX_INVALID;
+        fib_entry_cover_walk(cover,
+                             fib_entry_src_interface_update_glean_walk,
+                             NULL);
     }
 }
 
@@ -146,7 +188,7 @@ fib_entry_src_interface_cover_change (fib_entry_src_t *src,
 	.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
     };
 
-    if (FIB_NODE_INDEX_INVALID == src->interface.fesi_cover)
+    if (FIB_NODE_INDEX_INVALID == src->u.interface.fesi_cover)
     {
 	/*
 	 * not tracking the cover. surprised we got poked?
@@ -159,8 +201,9 @@ fib_entry_src_interface_cover_change (fib_entry_src_t *src,
      * entry inserted benaeth it. That does not necessarily mean that this
      * entry is covered by the new prefix. check that
      */
-    if (src->rr.fesr_cover != fib_table_get_less_specific(fib_entry->fe_fib_index,
-							  &fib_entry->fe_prefix))
+    if (src->u.interface.fesi_cover !=
+        fib_table_get_less_specific(fib_entry->fe_fib_index,
+                                    &fib_entry->fe_prefix))
     {
 	fib_entry_src_interface_deactivate(src, fib_entry);
 	fib_entry_src_interface_activate(src, fib_entry);
@@ -177,9 +220,9 @@ fib_entry_src_interface_installed (fib_entry_src_t *src,
      */
     fib_entry_t *cover;
 
-    if (FIB_NODE_INDEX_INVALID != src->interface.fesi_cover)
+    if (FIB_NODE_INDEX_INVALID != src->u.interface.fesi_cover)
     {
-	cover = fib_entry_get(src->interface.fesi_cover);
+	cover = fib_entry_get(src->u.interface.fesi_cover);
 
 	fib_attached_export_covered_added(cover,
 					  fib_entry_get_index(fib_entry));
@@ -190,7 +233,7 @@ static u8*
 fib_entry_src_interface_format (fib_entry_src_t *src,
 				u8* s)
 {
-    return (format(s, " cover:%d", src->interface.fesi_cover));
+    return (format(s, " cover:%d", src->u.interface.fesi_cover));
 }
 
 const static fib_entry_src_vft_t interface_src_vft = {
@@ -212,5 +255,6 @@ const static fib_entry_src_vft_t interface_src_vft = {
 void
 fib_entry_src_interface_register (void)
 {
-    fib_entry_src_register(FIB_SOURCE_INTERFACE, &interface_src_vft);    
+    fib_entry_src_behaviour_register(FIB_SOURCE_BH_INTERFACE,
+                                     &interface_src_vft);
 }