Merge pull request #16313 from FRRouting/mergify/bp/stable/10.0/pr-16305

bgpd: Ignore RFC8212 for BGP Confederations (backport #16305)
This commit is contained in:
Jafar Al-Gharaibeh 2024-07-02 16:56:19 -04:00 committed by GitHub
commit f49ef22940
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions

View File

@ -6024,7 +6024,8 @@ void bgp_set_stale_route(struct peer *peer, afi_t afi, safi_t safi)
bool bgp_outbound_policy_exists(struct peer *peer, struct bgp_filter *filter) bool bgp_outbound_policy_exists(struct peer *peer, struct bgp_filter *filter)
{ {
if (peer->sort == BGP_PEER_IBGP || peer->sub_sort == BGP_PEER_EBGP_OAD) if (peer->sort == BGP_PEER_CONFED || peer->sort == BGP_PEER_IBGP ||
peer->sub_sort == BGP_PEER_EBGP_OAD)
return true; return true;
if (peer->sort == BGP_PEER_EBGP && if (peer->sort == BGP_PEER_EBGP &&
@ -6037,7 +6038,8 @@ bool bgp_outbound_policy_exists(struct peer *peer, struct bgp_filter *filter)
bool bgp_inbound_policy_exists(struct peer *peer, struct bgp_filter *filter) bool bgp_inbound_policy_exists(struct peer *peer, struct bgp_filter *filter)
{ {
if (peer->sort == BGP_PEER_IBGP || peer->sub_sort == BGP_PEER_EBGP_OAD) if (peer->sort == BGP_PEER_CONFED || peer->sort == BGP_PEER_IBGP ||
peer->sub_sort == BGP_PEER_EBGP_OAD)
return true; return true;
if (peer->sort == BGP_PEER_EBGP if (peer->sort == BGP_PEER_EBGP

View File

@ -4,7 +4,6 @@
!debug bgp updates out !debug bgp updates out
! !
router bgp 200 router bgp 200
no bgp ebgp-requires-policy
bgp confederation identifier 300 bgp confederation identifier 300
bgp confederation peers 300 bgp confederation peers 300
neighbor 192.0.2.1 remote-as 100 neighbor 192.0.2.1 remote-as 100
@ -12,7 +11,9 @@ router bgp 200
! !
address-family ipv4 unicast address-family ipv4 unicast
network 203.0.113.16/28 network 203.0.113.16/28
neighbor 192.0.2.1 route-map any in
neighbor 192.0.2.1 route-map any out
neighbor 192.0.2.18 default-originate neighbor 192.0.2.18 default-originate
exit-address-family exit-address-family
! !
route-map any permit 10