proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 03:27:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra-mpls: fix regression caused by wrong conflict resolution

Browse Source 
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2016-12-08 22:04:52 -02:00 committed by Donald Sharp
parent 0f12455901
commit e5dd4bef5e
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zebra/zebra_vty.c
View File

@ -775,6 +775,15 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn, int mcast)
default:
break;
}
/* Label information */
if (nexthop->nh_label && nexthop->nh_label->num_labels)
{
vty_out (vty, " label %s",
mpls_label2str (nexthop->nh_label->num_labels,
nexthop->nh_label->label, buf, BUFSIZ));
}
vty_out (vty, "%s", VTY_NEWLINE);
}
vty_out (vty, "%s", VTY_NEWLINE);
@ -1015,6 +1024,14 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib,
break;
}
/* Label information */
if (nexthop->nh_label && nexthop->nh_label->num_labels)
{
vty_out (vty, " label %s",
mpls_label2str (nexthop->nh_label->num_labels,
nexthop->nh_label->label, buf, BUFSIZ));
}
if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_BLACKHOLE))
vty_out (vty, ", bh");
if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_REJECT))