Merge pull request #5717 from pguibert6WIND/flowspec_issue_redistribute

Flowspec issue redistribute

diff --cc bgpd/bgp_attr.c
index 53a096753eac32eb1a8bdf966bb7703efd745ba3,f1c91382a45148e32e3fe076ea53796bbd35b4a4..47da8fcb88a9add999158a30b8420846289abfac
--- 1/bgpd/bgp_attr.c
--- 2/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@@ -3227,9 -2966,12 +3227,11 @@@ size_t bgp_packet_mpattr_start(struct s
  
        /* Nexthop AFI */
        if (afi == AFI_IP
 -          && (safi == SAFI_UNICAST ||
 -              safi == SAFI_LABELED_UNICAST ||
 -              safi == SAFI_MULTICAST))
 +          && (safi == SAFI_UNICAST || safi == SAFI_LABELED_UNICAST
 +              || safi == SAFI_MPLS_VPN || safi == SAFI_MULTICAST))
                nh_afi = peer_cap_enhe(peer, afi, safi) ? AFI_IP6 : AFI_IP;
+       else if (safi == SAFI_FLOWSPEC)
+               nh_afi = afi;
        else
                nh_afi = BGP_NEXTHOP_AFI_FROM_NHLEN(attr->mp_nexthop_len);