From: Emanuele Di Pascale Date: Thu, 28 Mar 2019 16:02:33 +0000 (+0100) Subject: bgpd: fix show bgp labeled_unicast X-Git-Tag: 7.1_pulled~125^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=c512a6429c979e4d183512c49937474dbff77967;p=matthieu%2Ffrr.git bgpd: fix show bgp labeled_unicast while labeled_unicast routes should be fetched in the unicast table, we cannot set the safi to SAFI_UNICAST else the peer afc checks and subgroup retrieval will fail Signed-off-by: Emanuele Di Pascale --- diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index eca632dd44..f7768f921c 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -10774,7 +10774,11 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi, return; } - table = bgp->rib[afi][safi]; + /* labeled-unicast routes live in the unicast table */ + if (safi == SAFI_LABELED_UNICAST) + table = bgp->rib[afi][SAFI_UNICAST]; + else + table = bgp->rib[afi][safi]; output_count = filtered_count = 0; subgrp = peer_subgroup(peer, afi, safi); @@ -11028,10 +11032,6 @@ static int peer_adj_routes(struct vty *vty, struct peer *peer, afi_t afi, if (use_json) json = json_object_new_object(); - /* labeled-unicast routes live in the unicast table */ - if (safi == SAFI_LABELED_UNICAST) - safi = SAFI_UNICAST; - if (!peer || !peer->afc[afi][safi]) { if (use_json) { json_object_string_add(