diff options
Diffstat (limited to 'src/vnet/fib/fib_entry_src_adj.c')
| -rw-r--r-- | src/vnet/fib/fib_entry_src_adj.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/vnet/fib/fib_entry_src_adj.c b/src/vnet/fib/fib_entry_src_adj.c index 04c5c8dc1f7..e43e36ee4e5 100644 --- a/src/vnet/fib/fib_entry_src_adj.c +++ b/src/vnet/fib/fib_entry_src_adj.c @@ -27,8 +27,8 @@ 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 @@ -211,17 +211,17 @@ fib_entry_src_adj_activate (fib_entry_src_t *src, * 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)); @@ -240,7 +240,7 @@ fib_entry_src_adj_activate (fib_entry_src_t *src, if (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover)) { 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, }; @@ -267,7 +267,7 @@ 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->adj.fesa_cover), + .cover_itf = fib_entry_get_resolving_interface(src->u.adj.fesa_cover), .flags = FIB_PATH_EXT_ADJ_FLAG_NONE, .src = src, }; @@ -292,24 +292,24 @@ fib_entry_src_adj_deactivate (fib_entry_src_t *src, /* * remove the depednecy on the covering entry */ - 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_entry_cover_untrack(cover, src->adj.fesa_sibling); + 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 @@ -321,8 +321,8 @@ fib_entry_src_adj_installed (fib_entry_src_t *src, */ 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)); @@ -369,9 +369,9 @@ fib_entry_src_adj_cover_update (fib_entry_src_t *src, }; fib_entry_t *cover; - ASSERT(FIB_NODE_INDEX_INVALID != src->adj.fesa_cover); + ASSERT(FIB_NODE_INDEX_INVALID != src->u.adj.fesa_cover); - cover = fib_entry_get(src->adj.fesa_cover); + cover = fib_entry_get(src->u.adj.fesa_cover); res.install = (FIB_ENTRY_FLAG_ATTACHED & fib_entry_get_flags_i(cover)); |