diff options
Diffstat (limited to 'src/vnet/fib')
-rw-r--r-- | src/vnet/fib/fib_entry.c | 20 | ||||
-rw-r--r-- | src/vnet/fib/fib_node.h | 6 | ||||
-rw-r--r-- | src/vnet/fib/fib_path.c | 1 |
3 files changed, 25 insertions, 2 deletions
diff --git a/src/vnet/fib/fib_entry.c b/src/vnet/fib/fib_entry.c index 6edf31b47f3..119a7ac5e77 100644 --- a/src/vnet/fib/fib_entry.c +++ b/src/vnet/fib/fib_entry.c @@ -1362,7 +1362,7 @@ fib_entry_cover_updated (fib_node_index_t fib_entry_index) if (0 == index) { /* - * only the best source gets to set the back walk flags + * only the best source gets to set the install result */ res = fib_entry_src_action_cover_update(fib_entry, esrc); bflags = fib_entry_src_get_flags(esrc); @@ -1370,7 +1370,23 @@ fib_entry_cover_updated (fib_node_index_t fib_entry_index) } else { - fib_entry_src_action_cover_update(fib_entry, esrc); + /* + * contirubting sources can set backwalk flags + */ + if (esrc->fes_flags & FIB_ENTRY_SRC_FLAG_CONTRIBUTING) + { + fib_entry_src_cover_res_t tmp = { + .install = !0, + .bw_reason = FIB_NODE_BW_REASON_FLAG_NONE, + }; + + tmp = fib_entry_src_action_cover_update(fib_entry, esrc); + res.bw_reason |= tmp.bw_reason; + } + else + { + fib_entry_src_action_cover_update(fib_entry, esrc); + } } index++; })); diff --git a/src/vnet/fib/fib_node.h b/src/vnet/fib/fib_node.h index 5cf9182560f..27e67b11c87 100644 --- a/src/vnet/fib/fib_node.h +++ b/src/vnet/fib/fib_node.h @@ -119,6 +119,10 @@ typedef enum fib_node_back_walk_reason_t_ { */ FIB_NODE_BW_REASON_ADJ_UPDATE, /** + * Walk update the adjacency MTU + */ + FIB_NODE_BW_REASON_ADJ_MTU, + /** * Walk to update children to inform them the adjacency is now down. */ FIB_NODE_BW_REASON_ADJ_DOWN, @@ -135,6 +139,7 @@ typedef enum fib_node_back_walk_reason_t_ { [FIB_NODE_BW_REASON_INTERFACE_DOWN] = "if-down", \ [FIB_NODE_BW_REASON_INTERFACE_DELETE] = "if-delete", \ [FIB_NODE_BW_REASON_ADJ_UPDATE] = "adj-update", \ + [FIB_NODE_BW_REASON_ADJ_MTU] = "adj-mtu", \ [FIB_NODE_BW_REASON_ADJ_DOWN] = "adj-down", \ } @@ -154,6 +159,7 @@ typedef enum fib_node_bw_reason_flag_t_ { FIB_NODE_BW_REASON_FLAG_INTERFACE_DOWN = (1 << FIB_NODE_BW_REASON_INTERFACE_DOWN), FIB_NODE_BW_REASON_FLAG_INTERFACE_DELETE = (1 << FIB_NODE_BW_REASON_INTERFACE_DELETE), FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE = (1 << FIB_NODE_BW_REASON_ADJ_UPDATE), + FIB_NODE_BW_REASON_FLAG_ADJ_MTU = (1 << FIB_NODE_BW_REASON_ADJ_MTU), FIB_NODE_BW_REASON_FLAG_ADJ_DOWN = (1 << FIB_NODE_BW_REASON_ADJ_DOWN), } __attribute__ ((packed)) fib_node_bw_reason_flag_t; diff --git a/src/vnet/fib/fib_path.c b/src/vnet/fib/fib_path.c index f48b64484cb..01140d5d0dc 100644 --- a/src/vnet/fib/fib_path.c +++ b/src/vnet/fib/fib_path.c @@ -999,6 +999,7 @@ fib_path_back_walk_notify (fib_node_t *node, &path->fp_dpo); } if ((FIB_NODE_BW_REASON_FLAG_ADJ_UPDATE & ctx->fnbw_reason) || + (FIB_NODE_BW_REASON_FLAG_ADJ_MTU & ctx->fnbw_reason) || (FIB_NODE_BW_REASON_FLAG_ADJ_DOWN & ctx->fnbw_reason)) { /* |