From f81e127ed15b7500249be9b4294ce795ec2b08d6 Mon Sep 17 00:00:00 2001 From: Don Slice Date: Fri, 9 Sep 2016 06:35:47 -0700 Subject: [PATCH] bgpd: Display interface next-hop for "show ip bgp" with unnumbered Found that the logic had been changed to determine whether the next-hop is a v4 or v6 address. This caused an unnumbered interface to be seen as ipv4 instead of ipv6 so the swp port was not correctly displayed. Changed it back. Manual testing attaced to the ticket and bgp-min will be run before committing. Ticket: CM-12759 Signed-off-by: Don Slice Reviewed-by: CCR-5166 --- bgpd/bgp_route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index f767fae1a9..af0159855d 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -5922,7 +5922,7 @@ route_vty_out (struct vty *vty, struct prefix *p, vty_out(vty, "?"); } /* IPv4 Next Hop */ - else if (p->family == AF_INET || !BGP_ATTR_NEXTHOP_AFI_IP6(attr)) + else if (p->family == AF_INET && !BGP_ATTR_NEXTHOP_AFI_IP6(attr)) { if (json_paths) { -- 2.39.5