proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 11:24:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4721 from dslicenc/bgpd-fix-nexthop

Browse Source 
bgpd: encode implicit next-hop-self in some vrf route leaking scenarios
This commit is contained in:
Russ White 2019-07-30 10:50:32 -04:00 committed by GitHub
commit 0db38652f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bgpd/bgp_attr.c
View File

@ -3215,6 +3215,8 @@ bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
/* Nexthop attribute. */ /* Nexthop attribute. */
if (afi == AFI_IP && safi == SAFI_UNICAST if (afi == AFI_IP && safi == SAFI_UNICAST
&& !peer_cap_enhe(peer, afi, safi)) { && !peer_cap_enhe(peer, afi, safi)) {
afi_t nh_afi = BGP_NEXTHOP_AFI_FROM_NHLEN(attr->mp_nexthop_len);
if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) { if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {
stream_putc(s, BGP_ATTR_FLAG_TRANS); stream_putc(s, BGP_ATTR_FLAG_TRANS);
stream_putc(s, BGP_ATTR_NEXT_HOP); stream_putc(s, BGP_ATTR_NEXT_HOP);
@ -3222,17 +3224,18 @@ bgp_size_t bgp_packet_attribute(struct bgp *bgp, struct peer *peer,
attr); attr);
stream_putc(s, 4); stream_putc(s, 4);
stream_put_ipv4(s, attr->nexthop.s_addr); stream_put_ipv4(s, attr->nexthop.s_addr);
} else if (peer_cap_enhe(from, afi, safi)) { } else if (peer_cap_enhe(from, afi, safi)
|| (nh_afi == AFI_IP6)) {
/* /*
* Likely this is the case when an IPv4 prefix was * Likely this is the case when an IPv4 prefix was
* received with * received with Extended Next-hop capability in this
* Extended Next-hop capability and now being advertised * or another vrf and is now being advertised to
* to * non-ENHE peers. Since peer_cap_enhe only checks
* non-ENHE peers. * peers in this vrf, also check the nh_afi to catch
* the case where the originator was in another vrf.
* Setting the mandatory (ipv4) next-hop attribute here * Setting the mandatory (ipv4) next-hop attribute here
* to enable * to enable implicit next-hop self with correct A-F
* implicit next-hop self with correct (ipv4 address * (ipv4 address family).
* family).
*/ */
stream_putc(s, BGP_ATTR_FLAG_TRANS); stream_putc(s, BGP_ATTR_FLAG_TRANS);
stream_putc(s, BGP_ATTR_NEXT_HOP); stream_putc(s, BGP_ATTR_NEXT_HOP);