From: Renato Westphal <renato@opensourcerouting.org>
Date: Fri, 9 Dec 2016 00:04:52 +0000 (-0200)
Subject: zebra-mpls: fix regression caused by wrong conflict resolution
X-Git-Tag: frr-3.0-branchpoint~121
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e5dd4bef5eeeac880ba97480b76d46f32726985a;p=mirror%2Ffrr.git

zebra-mpls: fix regression caused by wrong conflict resolution

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 397a489011..e5f9b17e81 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -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))