From 8f6e3218623ddbb836d6a47ed2678f8ab99f2471 Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Mon, 4 Jun 2018 17:10:18 -0700 Subject: BIER CLI show commands; no crash on non-existant objects (VPP-1303) DBGvpp# sh bier disp entry DBGvpp# sh bier disp entry 0 No such BIER disp entry: 0 DBGvpp# sh bier disp table DBGvpp# sh bier disp table 0 No such BIER disp table: 0 DBGvpp# sh bier disp table 11 No such BIER disp table: 11 DBGvpp# DBGvpp# sh bier bift no BIFT entries DBGvpp# sh bier bift set 0 no BIFT entries DBGvpp# sh bier bift set 0 sd 0 bsl 0 no BIFT entries DBGvpp# DBGvpp# sh bier fib No BIER tables DBGvpp# sh bier fib 0 DBGvpp# sh bier fib 0 4 DBGvpp# sh bier fmask DBGvpp# sh bier fmask 2 No BIER f-mask 2 DBGvpp# sh bier imp DBGvpp# sh bier imp 0 No such BIER imposition: 0 Change-Id: Ibadac3441dd8a6d1b96bd9ee4358e28498875b95 Signed-off-by: Neale Ranns --- src/vnet/bier/bier_imp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/vnet/bier/bier_imp.c') diff --git a/src/vnet/bier/bier_imp.c b/src/vnet/bier/bier_imp.c index bd934b77f16..0c87d1724b4 100644 --- a/src/vnet/bier/bier_imp.c +++ b/src/vnet/bier/bier_imp.c @@ -275,8 +275,15 @@ show_bier_imp (vlib_main_t * vm, } else { - vlib_cli_output(vm, "%U", format_bier_imp, bii, 1, - BIER_SHOW_DETAIL); + if (pool_is_free_index(bier_imp_pool, bii)) + { + vlib_cli_output(vm, "No such BIER imposition: %d", bii); + } + else + { + vlib_cli_output(vm, "%U", format_bier_imp, bii, 1, + BIER_SHOW_DETAIL); + } } return (NULL); } -- cgit 1.2.3-korg