commit 87866037c44be7dd7467981757d3206835901996
author Neale Ranns <nranns@cisco.com> Wed Nov 25 09:14:22 2020 +0000
committer Beno�t Ganne <bganne@cisco.com> Thu Nov 26 10:16:58 2020 +0000
tree 0bf439e7459b7d6c1808395ecf73f344e8ec5541
parent cfe949dbf001d8fa18301ecc11c644f8cb39c5d7

fib: Only track cover if activated

Type: fix

also cleanup any tracking at delete

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

src/vnet/fib/fib_entry_src_adj.c

diff --git a/src/vnet/fib/fib_entry_src_adj.c b/src/vnet/fib/fib_entry_src_adj.c
index ec80a86..fb46f2e 100644
--- a/src/vnet/fib/fib_entry_src_adj.c
+++ b/src/vnet/fib/fib_entry_src_adj.c
@@ -125,6 +125,12 @@
 fib_entry_src_adj_remove (fib_entry_src_t *src)
 {
     src->fes_pl = FIB_NODE_INDEX_INVALID;
+
+    if (FIB_NODE_INDEX_INVALID != src->u.adj.fesa_cover)
+    {
+        fib_entry_cover_untrack(fib_entry_get(src->u.adj.fesa_cover),
+                                src->u.adj.fesa_sibling);
+    }
 }
 
 /*
@@ -311,6 +317,7 @@
     fib_attached_export_covered_removed(cover, fib_entry_get_index(fib_entry));
 
     src->u.adj.fesa_cover = FIB_NODE_INDEX_INVALID;
+    src->u.adj.fesa_sibling = FIB_NODE_INDEX_INVALID;
 }
 
 static u8*
@@ -341,10 +348,17 @@
                                 const fib_entry_t *fib_entry)
 {
     fib_entry_src_cover_res_t res = {
-        .install = !0,
+        .install = 0,
         .bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
     };
 
+    /*
+     * not interested in a change to the cover if the cover
+     * is not being tracked, i.e. the source is not active
+     */
+    if (FIB_NODE_INDEX_INVALID == src->u.adj.fesa_cover)
+        return res;
+
     fib_entry_src_adj_deactivate(src, fib_entry);
 
     res.install = fib_entry_src_adj_activate(src, fib_entry);