From: Quentin Young <qlyoung@users.noreply.github.com>
Date: Tue, 4 Feb 2020 20:48:24 +0000 (-0500)
Subject: Merge pull request #5717 from pguibert6WIND/flowspec_issue_redistribute
X-Git-Tag: base_7.4~377
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=03ed0334e831da9b57c02f590b48cb03caecfb6a;p=matthieu%2Ffrr.git

Merge pull request #5717 from pguibert6WIND/flowspec_issue_redistribute

Flowspec issue redistribute
---

03ed0334e831da9b57c02f590b48cb03caecfb6a
diff --cc bgpd/bgp_attr.c
index 53a096753e,f1c91382a4..47da8fcb88
--- a/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);