Merge pull request #4038 from manuhalo/fix-lu-bgp-master

bgpd: fix show bgp labeled_unicast
This commit is contained in:
Donald Sharp 2019-03-28 20:17:38 -04:00 committed by GitHub
commit 36456953c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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(