From eb4a93fb098a340e18cdfcfa4a2d1ebcf430ec83 Mon Sep 17 00:00:00 2001
From: Dinesh G Dutt <5016467+ddutt@users.noreply.github.com>
Date: Tue, 13 Aug 2019 16:28:16 +0000
Subject: [PATCH]     zebra: Display master interface names, not ifindices

    When displaying the master interface's information in "show interface",
    the display is currently the ifindex of the master interface. Make it
    display the name as well as that is more useful than the name.

    Signed-off-by: Dinesh G Dutt<5016467+ddutt@users.noreply.github.com>
---
 zebra/interface.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/zebra/interface.c b/zebra/interface.c
index 732e900bbd..a2f80aff4e 100644
--- a/zebra/interface.c
+++ b/zebra/interface.c
@@ -1382,26 +1382,35 @@ static void if_dump_vty(struct vty *vty, struct interface *ifp)
 		struct zebra_l2info_brslave *br_slave;
 
 		br_slave = &zebra_if->brslave_info;
-		if (br_slave->bridge_ifindex != IFINDEX_INTERNAL)
-			vty_out(vty, "  Master (bridge) ifindex %u\n",
-				br_slave->bridge_ifindex);
+		if (br_slave->bridge_ifindex != IFINDEX_INTERNAL) {
+			if (br_slave->br_if)
+				vty_out(vty, "  Master interface: %s\n",
+					br_slave->br_if->name);
+			else
+				vty_out(vty, "  Master ifindex: %u\n",
+					br_slave->bridge_ifindex);
+		}
 	}
 
 	if (IS_ZEBRA_IF_BOND_SLAVE(ifp)) {
 		struct zebra_l2info_bondslave *bond_slave;
 
 		bond_slave = &zebra_if->bondslave_info;
-		if (bond_slave->bond_ifindex != IFINDEX_INTERNAL)
-			vty_out(vty, "  Master (bond) ifindex %u\n",
-				bond_slave->bond_ifindex);
+		if (bond_slave->bond_ifindex != IFINDEX_INTERNAL) {
+			if (bond_slave->bond_if)
+				vty_out(vty, "  Master interface: %s\n",
+					bond_slave->bond_if->name);
+			else
+				vty_out(vty, "  Master ifindex: %u\n",
+					bond_slave->bond_ifindex);
+		}
 	}
 
 	if (zebra_if->link_ifindex != IFINDEX_INTERNAL) {
-		vty_out(vty, "  Link ifindex %u", zebra_if->link_ifindex);
 		if (zebra_if->link)
-			vty_out(vty, "(%s)\n", zebra_if->link->name);
+			vty_out(vty, "  Parent interface: %s\n", zebra_if->link->name);
 		else
-			vty_out(vty, "(Unknown)\n");
+			vty_out(vty, "  Parent ifindex: %d\n", zebra_if->link_ifindex);
 	}
 
 	if (HAS_LINK_PARAMS(ifp)) {
-- 
2.39.5