diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2024-11-23 09:13:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-23 09:13:06 -0500 |
| commit | d745f4eae5d6e8df84de930632a3bcf3044408d3 (patch) | |
| tree | 0464f86f7cc6306363219ea3abcb8b452df80c8a | |
| parent | 48306bae2c0be6d3e2decac5941c5635bb0a8951 (diff) | |
| parent | 8cc6359fdc849def02716cc473662a4e616e97e9 (diff) | |
Merge pull request #17459 from opensourcerouting/fix/disable_rpki_community_by_default
bgpd: Disable sending ROV extended community by default
| -rw-r--r-- | bgpd/bgp_vty.c | 4 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 10 | ||||
| -rw-r--r-- | doc/user/bgp.rst | 2 | ||||
| -rw-r--r-- | tests/topotests/bgp_rpki_topo1/r2/bgpd.conf | 1 |
4 files changed, 5 insertions, 12 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index f4426a5a68..cba1cdaf1a 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -19132,9 +19132,7 @@ static void bgp_config_write_peer_af(struct vty *vty, struct bgp *bgp, if (peergroup_af_flag_check(peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY_RPKI)) - vty_out(vty, - " no neighbor %s send-community extended rpki\n", - addr); + vty_out(vty, " neighbor %s send-community extended rpki\n", addr); } /* Default information */ diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index d9d20563f9..a8431bee97 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1569,19 +1569,13 @@ struct peer *peer_new(struct bgp *bgp) /* Set default flags. */ FOREACH_AFI_SAFI (afi, safi) { SET_FLAG(peer->af_flags[afi][safi], PEER_FLAG_SEND_COMMUNITY); - SET_FLAG(peer->af_flags[afi][safi], - PEER_FLAG_SEND_EXT_COMMUNITY); - SET_FLAG(peer->af_flags[afi][safi], - PEER_FLAG_SEND_EXT_COMMUNITY_RPKI); + SET_FLAG(peer->af_flags[afi][safi], PEER_FLAG_SEND_EXT_COMMUNITY); SET_FLAG(peer->af_flags[afi][safi], PEER_FLAG_SEND_LARGE_COMMUNITY); SET_FLAG(peer->af_flags_invert[afi][safi], PEER_FLAG_SEND_COMMUNITY); - SET_FLAG(peer->af_flags_invert[afi][safi], - PEER_FLAG_SEND_EXT_COMMUNITY); - SET_FLAG(peer->af_flags_invert[afi][safi], - PEER_FLAG_SEND_EXT_COMMUNITY_RPKI); + SET_FLAG(peer->af_flags_invert[afi][safi], PEER_FLAG_SEND_EXT_COMMUNITY); SET_FLAG(peer->af_flags_invert[afi][safi], PEER_FLAG_SEND_LARGE_COMMUNITY); peer->addpath_type[afi][safi] = BGP_ADDPATH_NONE; diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst index 0c7fcecb9b..c0db7f2b87 100644 --- a/doc/user/bgp.rst +++ b/doc/user/bgp.rst @@ -1803,7 +1803,7 @@ Configuring Peers Send the extended RPKI communities to the peer. RPKI extended community can be send only to iBGP and eBGP-OAD peers. - Default: enabled. + Default: disabled. .. clicmd:: neighbor PEER weight WEIGHT diff --git a/tests/topotests/bgp_rpki_topo1/r2/bgpd.conf b/tests/topotests/bgp_rpki_topo1/r2/bgpd.conf index 4de177dc25..e5dc7f65f9 100644 --- a/tests/topotests/bgp_rpki_topo1/r2/bgpd.conf +++ b/tests/topotests/bgp_rpki_topo1/r2/bgpd.conf @@ -9,6 +9,7 @@ router bgp 65002 neighbor 192.168.4.4 timers connect 1 address-family ipv4 unicast neighbor 192.168.4.4 next-hop-self + neighbor 192.168.4.4 send-community extended rpki exit-address-family ! router bgp 65002 vrf vrf10 |