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 <sharpd@cumulusnetworks.com>

diff --git a/lib/route_types.pl b/lib/route_types.pl
index 7435272761c631f5ddd69121ee4a0684363f9462..f297096633140f327af9c0a1b5307c49855d8a53 100755 (executable)
--- 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 14288d7bc4b3714880863e17c9f8db7800bd206c..34ca5e7bd3f8cb500bab2f6240e7ca8880f08624 100644 (file)
--- 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))