From da9dbc349186ffd5f2250827e432d1d10d3b6d80 Mon Sep 17 00:00:00 2001 From: Don Slice Date: Fri, 3 Nov 2017 16:45:02 +0000 Subject: [PATCH] bgpd: default originate issue with intf peers and global intf address Problem reported that a receiver of a default route issued across bgp unnumbered peering using default originate would have the route stay as inactive. Discovered we were messing up the nexthop value sent to the peer in this one particular case. Manual testing good, fix supplied to the submitter and verified to resolve the problem. bgp-smoke completed successfully. Ticket: CM-18634 Signed-off-by: Don Slice Reviewed-by: Donald Sharp --- bgpd/bgp_updgrp_adv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c index 8a24cba598..b4f18c9f5e 100644 --- a/bgpd/bgp_updgrp_adv.c +++ b/bgpd/bgp_updgrp_adv.c @@ -691,7 +691,7 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw) p.family = afi2family(afi); p.prefixlen = 0; - if (afi == AFI_IP6) { + if ((afi == AFI_IP6) || peer_cap_enhe(peer, afi, safi)) { /* IPv6 global nexthop must be included. */ attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV6_GLOBAL; -- 2.39.5