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 <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 331c0ece2d36a49934f72e01353043e2f9f3fee1..fe7a80ccf28c58f676c2f6c84c256bdefe3a4412 100644 (file)
--- 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);