From 88b8d81aca632dca6f3de4ea5311f122af2e139d Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 20 Dec 2019 20:06:56 -0500 Subject: [PATCH] bgpd: Allow ipv4 multicast to use v4 nexthops When passing a v4 multicast route to a peer send the v4 nexthop as a preferred methodology. Fixes: #5582 Signed-off-by: Donald Sharp --- bgpd/bgp_attr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 331c0ece2d..fe7a80ccf2 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -2905,7 +2905,9 @@ size_t bgp_packet_mpattr_start(struct stream *s, struct peer *peer, afi_t afi, /* Nexthop AFI */ if (afi == AFI_IP - && (safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST)) + && (safi == SAFI_UNICAST || + safi == SAFI_LABELED_UNICAST || + safi == SAFI_MULTICAST)) nh_afi = peer_cap_enhe(peer, afi, safi) ? AFI_IP6 : AFI_IP; else nh_afi = BGP_NEXTHOP_AFI_FROM_NHLEN(attr->mp_nexthop_len); -- 2.39.5