zebra: mpls nexthop entry displays also interface when available

The 'show mpls table json' command displays the outgoing interface
name only when the nexthop type is either NEXTHOP_TYPE_IFINDEX or
NEXTHOP_TYPE_IPV6_IFINDEX. add the interface name for the nexthop
type NEXTHOP_TYPE_IPV4_IFINDEX.

Fixes: ("b78b820d46d6") MPLS: Display enhancements and JSON support
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/zebra/zebra_mpls.c b/zebra/zebra_mpls.c
index 38a76a299879d7b99e304f11addff4c362f2abc2..47d5b64a3fa1e9d2272a159e53de4817a7961e9e 100644 (file)
--- a/zebra/zebra_mpls.c
+++ b/zebra/zebra_mpls.c
@@ -1525,6 +1525,10 @@ static json_object *nhlfe_json(struct zebra_nhlfe *nhlfe)
        case NEXTHOP_TYPE_IPV4_IFINDEX:
                json_object_string_addf(json_nhlfe, "nexthop", "%pI4",
                                        &nexthop->gate.ipv4);
+               if (nexthop->ifindex)
+                       json_object_string_add(json_nhlfe, "interface",
+                                              ifindex2ifname(nexthop->ifindex,
+                                                             nexthop->vrf_id));
                break;
        case NEXTHOP_TYPE_IPV6:
        case NEXTHOP_TYPE_IPV6_IFINDEX: