X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_table.c;h=d3cf5dc88b112aae26cf036fd66b4ca29e0a048e;hb=9db6ada779794779158163f6293b479ae7f6ad5e;hp=3778fa9a9445b210ee7741b61ed2406f5b753fe0;hpb=0d3d4824a46205e776ff32c82be4cb514f459a5f;p=vpp.git diff --git a/src/vnet/fib/fib_table.c b/src/vnet/fib/fib_table.c index 3778fa9a944..d3cf5dc88b1 100644 --- a/src/vnet/fib/fib_table.c +++ b/src/vnet/fib/fib_table.c @@ -23,6 +23,8 @@ #include #include +const static char * fib_table_flags_strings[] = FIB_TABLE_ATTRIBUTES; + fib_table_t * fib_table_get (fib_node_index_t index, fib_protocol_t proto) @@ -1305,6 +1307,26 @@ format_fib_table_name (u8* s, va_list* ap) return (s); } +u8* +format_fib_table_flags (u8 *s, va_list *args) +{ + fib_table_flags_t flags = va_arg(*args, int); + fib_table_attribute_t attr; + + if (!flags) + { + return format(s, "none"); + } + + FOR_EACH_FIB_TABLE_ATTRIBUTE(attr) { + if (1 << attr & flags) { + s = format(s, "%s", fib_table_flags_strings[attr]); + } + } + + return (s); +} + /** * @brief Table flush context. Store the indicies of matching FIB entries * that need to be removed. @@ -1335,7 +1357,6 @@ fib_table_flush_cb (fib_node_index_t fib_entry_index, return (FIB_TABLE_WALK_CONTINUE); } - void fib_table_flush (u32 fib_index, fib_protocol_t proto, @@ -1359,6 +1380,79 @@ fib_table_flush (u32 fib_index, vec_free(ctx.ftf_entries); } +static fib_table_walk_rc_t +fib_table_mark_cb (fib_node_index_t fib_entry_index, + void *arg) +{ + fib_table_flush_ctx_t *ctx = arg; + + if (fib_entry_is_sourced(fib_entry_index, ctx->ftf_source)) + { + fib_entry_mark(fib_entry_index, ctx->ftf_source); + } + return (FIB_TABLE_WALK_CONTINUE); +} + +void +fib_table_mark (u32 fib_index, + fib_protocol_t proto, + fib_source_t source) +{ + fib_table_flush_ctx_t ctx = { + .ftf_source = source, + }; + fib_table_t *fib_table; + + fib_table = fib_table_get(fib_index, proto); + + fib_table->ft_epoch++; + fib_table->ft_flags |= FIB_TABLE_FLAG_RESYNC; + + fib_table_walk(fib_index, proto, + fib_table_mark_cb, + &ctx); +} + +static fib_table_walk_rc_t +fib_table_sweep_cb (fib_node_index_t fib_entry_index, + void *arg) +{ + fib_table_flush_ctx_t *ctx = arg; + + if (fib_entry_is_marked(fib_entry_index, ctx->ftf_source)) + { + vec_add1(ctx->ftf_entries, fib_entry_index); + } + return (FIB_TABLE_WALK_CONTINUE); +} + +void +fib_table_sweep (u32 fib_index, + fib_protocol_t proto, + fib_source_t source) +{ + fib_table_flush_ctx_t ctx = { + .ftf_source = source, + }; + fib_node_index_t *fib_entry_index; + fib_table_t *fib_table; + + fib_table = fib_table_get(fib_index, proto); + + fib_table->ft_flags &= ~FIB_TABLE_FLAG_RESYNC; + + fib_table_walk(fib_index, proto, + fib_table_sweep_cb, + &ctx); + + vec_foreach(fib_entry_index, ctx.ftf_entries) + { + fib_table_entry_delete_index(*fib_entry_index, source); + } + + vec_free(ctx.ftf_entries); +} + u8 * format_fib_table_memory (u8 *s, va_list *args) {