From cd8c2a27c1c7b183c36f0de906d400529a18d652 Mon Sep 17 00:00:00 2001 From: Mark Stapp Date: Tue, 21 Sep 2021 10:37:39 -0400 Subject: [PATCH] bgpd: make show bgp labeled-unicast work Yet-another path where the safi needs to be changed to locate the unicast table where LU routes live. Signed-off-by: Mark Stapp --- bgpd/bgp_route.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 5a16fecc26..2f9a98bd15 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -11121,6 +11121,10 @@ static int bgp_show(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi, return CMD_WARNING; } + /* Labeled-unicast routes live in the unicast table. */ + if (safi == SAFI_LABELED_UNICAST) + safi = SAFI_UNICAST; + table = bgp->rib[afi][safi]; /* use MPLS and ENCAP specific shows until they are merged */ if (safi == SAFI_MPLS_VPN) { @@ -11133,9 +11137,6 @@ static int bgp_show(struct vty *vty, struct bgp *bgp, afi_t afi, safi_t safi, output_arg, use_json, 1, NULL, NULL); } - /* labeled-unicast routes live in the unicast table */ - else if (safi == SAFI_LABELED_UNICAST) - safi = SAFI_UNICAST; return bgp_show_table(vty, bgp, safi, table, type, output_arg, NULL, 1, NULL, NULL, &json_header_depth, show_flags,