static void
fib_entry_src_adj_init (fib_entry_src_t *src)
{
- src->adj.fesa_cover = FIB_NODE_INDEX_INVALID;
- src->adj.fesa_sibling = FIB_NODE_INDEX_INVALID;
+ src->u.adj.fesa_cover = FIB_NODE_INDEX_INVALID;
+ src->u.adj.fesa_sibling = FIB_NODE_INDEX_INVALID;
}
static void
return (FIB_PATH_LIST_WALK_CONTINUE);
}
-/*
- * Source activate.
- * Called when the source is the new longer best source on the entry
- */
static int
fib_entry_src_adj_activate (fib_entry_src_t *src,
const fib_entry_t *fib_entry)
* find the covering prefix. become a dependent thereof.
* there should always be a cover, though it may be the default route.
*/
- src->adj.fesa_cover = fib_table_get_less_specific(fib_entry->fe_fib_index,
- &fib_entry->fe_prefix);
+ src->u.adj.fesa_cover = fib_table_get_less_specific(fib_entry->fe_fib_index,
+ &fib_entry->fe_prefix);
- ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
- ASSERT(fib_entry_get_index(fib_entry) != src->adj.fesa_cover);
+ ASSERT(FIB_NODE_INDEX_INVALID != src->u.adj.fesa_cover);
+ ASSERT(fib_entry_get_index(fib_entry) != src->u.adj.fesa_cover);
- cover = fib_entry_get(src->adj.fesa_cover);
+ cover = fib_entry_get(src->u.adj.fesa_cover);
ASSERT(cover != fib_entry);
- src->adj.fesa_sibling =
+ src->u.adj.fesa_sibling =
fib_entry_cover_track(cover,
fib_entry_get_index(fib_entry));
* ip route add 10.0.0.0/24 Eth0
* is attached. and we want adj-fibs to install on Eth0.
*/
- if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover))
+ if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover) ||
+ (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_for_source(src->u.adj.fesa_cover,
+ FIB_SOURCE_INTERFACE)))
{
fib_entry_src_path_list_walk_cxt_t ctx = {
- .cover_itf = fib_entry_get_resolving_interface(src->adj.fesa_cover),
+ .cover_itf = fib_entry_get_resolving_interface(src->u.adj.fesa_cover),
.flags = FIB_PATH_EXT_ADJ_FLAG_NONE,
.src = src,
};
return (0);
}
+/*
+ * Source re-activate.
+ * Called when the source path lit has changed and the source is still
+ * the best source
+ */
+static int
+fib_entry_src_adj_reactivate (fib_entry_src_t *src,
+ const fib_entry_t *fib_entry)
+{
+ fib_entry_src_path_list_walk_cxt_t ctx = {
+ .cover_itf = fib_entry_get_resolving_interface(src->u.adj.fesa_cover),
+ .flags = FIB_PATH_EXT_ADJ_FLAG_NONE,
+ .src = src,
+ };
+
+ fib_path_list_walk(src->fes_pl,
+ fib_entry_src_adj_path_list_walk,
+ &ctx);
+
+ return (FIB_PATH_EXT_ADJ_FLAG_REFINES_COVER & ctx.flags);
+}
+
/*
* Source Deactivate.
* Called when the source is no longer best source on the entry
fib_entry_t *cover;
/*
- * remove the depednecy on the covering entry
+ * remove the dependency on the covering entry
*/
- ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
- cover = fib_entry_get(src->adj.fesa_cover);
+ if (FIB_NODE_INDEX_INVALID == src->u.adj.fesa_cover)
+ {
+ /*
+ * this is the case if the entry is in the non-forwarding trie
+ */
+ return;
+ }
- fib_entry_cover_untrack(cover, src->adj.fesa_sibling);
+ cover = fib_entry_get(src->u.adj.fesa_cover);
+ fib_entry_cover_untrack(cover, src->u.adj.fesa_sibling);
/*
* tell the cover this entry no longer needs exporting
*/
fib_attached_export_covered_removed(cover, fib_entry_get_index(fib_entry));
- src->adj.fesa_cover = FIB_NODE_INDEX_INVALID;
+ src->u.adj.fesa_cover = FIB_NODE_INDEX_INVALID;
}
static u8*
fib_entry_src_adj_format (fib_entry_src_t *src,
u8* s)
{
- return (format(s, "cover:%d", src->adj.fesa_cover));
+ return (format(s, " cover:%d", src->u.adj.fesa_cover));
}
static void
*/
fib_entry_t *cover;
- ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
- cover = fib_entry_get(src->adj.fesa_cover);
+ ASSERT(FIB_NODE_INDEX_INVALID != src->u.adj.fesa_cover);
+ cover = fib_entry_get(src->u.adj.fesa_cover);
fib_attached_export_covered_added(cover,
fib_entry_get_index(fib_entry));
res.bw_reason = FIB_NODE_BW_REASON_FLAG_EVALUATE;
}
+ FIB_ENTRY_DBG(fib_entry, "adj-src-cover-changed");
return (res);
}
{
/*
* the cover has updated, i.e. its forwarding or flags
- * have changed. don't decativate/activate here, since this
+ * have changed. don't deactivate/activate here, since this
* prefix is updated during the covers walk.
*/
fib_entry_src_cover_res_t res = {
- .install = !0,
+ .install = 0,
.bw_reason = FIB_NODE_BW_REASON_FLAG_NONE,
};
fib_entry_t *cover;
- ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover);
-
- cover = fib_entry_get(src->adj.fesa_cover);
+ /*
+ * If there is no cover, then the source is not active and we can ignore
+ * this update
+ */
+ if (FIB_NODE_INDEX_INVALID != src->u.adj.fesa_cover)
+ {
+ cover = fib_entry_get(src->u.adj.fesa_cover);
- res.install = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover));
+ res.install = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover));
+ FIB_ENTRY_DBG(fib_entry, "adj-src-cover-updated");
+ }
return (res);
}
.fesv_remove = fib_entry_src_adj_remove,
.fesv_activate = fib_entry_src_adj_activate,
.fesv_deactivate = fib_entry_src_adj_deactivate,
+ .fesv_reactivate = fib_entry_src_adj_reactivate,
.fesv_format = fib_entry_src_adj_format,
.fesv_installed = fib_entry_src_adj_installed,
.fesv_cover_change = fib_entry_src_adj_cover_change,
void
fib_entry_src_adj_register (void)
{
- fib_entry_src_register(FIB_SOURCE_ADJ, &adj_src_vft);
+ fib_entry_src_behaviour_register(FIB_SOURCE_BH_ADJ, &adj_src_vft);
}