From b0538fc8b72eed7a7859a7670cf4e1c73b3bf3ff Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 29 Jan 2019 20:29:20 -0500 Subject: [PATCH] lib, zebra: Fix 'show ip route' char collision Apparently 'f' means both OpenFabric and a Failed kernel route installation. Let's switch the 'f' for the failed kernel route installation to 'r - rejected route'. Signed-off-by: Donald Sharp --- lib/route_types.pl | 2 +- zebra/zebra_vty.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/route_types.pl b/lib/route_types.pl index 7435272761..f297096633 100755 --- a/lib/route_types.pl +++ b/lib/route_types.pl @@ -121,7 +121,7 @@ sub codelist { } $str =~ s/ $//; push @lines, $str . "\\n\" \\\n"; - push @lines, " \" > - selected route, * - FIB route, q - queued route, f - failed route\\n\\n\""; + push @lines, " \" > - selected route, * - FIB route, q - queued route, r - rejected route\\n\\n\""; return join("", @lines); } diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c index 14288d7bc4..34ca5e7bd3 100644 --- a/zebra/zebra_vty.c +++ b/zebra/zebra_vty.c @@ -174,7 +174,7 @@ static char re_status_output_char(struct route_entry *re, struct nexthop *nhop) if (CHECK_FLAG(re->status, ROUTE_ENTRY_QUEUED)) return 'q'; - return 'f'; + return 'r'; } if (CHECK_FLAG(re->status, ROUTE_ENTRY_QUEUED)) -- 2.39.5