mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-04 16:57:43 +00:00
Merge pull request #17705 from opensourcerouting/fix/enforce-first-as_peer-group
bgpd: Fix enforce-first-as per peer-group removal
This commit is contained in:
commit
79be632713
@ -18783,7 +18783,11 @@ static void bgp_config_write_peer_global(struct vty *vty, struct bgp *bgp,
|
||||
|
||||
/* enforce-first-as */
|
||||
if (CHECK_FLAG(bgp->flags, BGP_FLAG_ENFORCE_FIRST_AS)) {
|
||||
if (!peergroup_flag_check(peer, PEER_FLAG_ENFORCE_FIRST_AS))
|
||||
/* The `no` form is printed because by default this enforcing
|
||||
* is enabled, thus we need to print it inverted.
|
||||
* See peer_new().
|
||||
*/
|
||||
if (peergroup_flag_check(peer, PEER_FLAG_ENFORCE_FIRST_AS))
|
||||
vty_out(vty, " no neighbor %s enforce-first-as\n", addr);
|
||||
} else {
|
||||
if (peergroup_flag_check(peer, PEER_FLAG_ENFORCE_FIRST_AS))
|
||||
|
@ -1560,8 +1560,13 @@ struct peer *peer_new(struct bgp *bgp)
|
||||
|
||||
SET_FLAG(peer->sflags, PEER_STATUS_CAPABILITY_OPEN);
|
||||
|
||||
if (CHECK_FLAG(bgp->flags, BGP_FLAG_ENFORCE_FIRST_AS))
|
||||
peer_flag_set(peer, PEER_FLAG_ENFORCE_FIRST_AS);
|
||||
/* By default this is enabled, thus we need to mark it as
|
||||
* inverted in order to display correctly in the configuration.
|
||||
*/
|
||||
if (CHECK_FLAG(bgp->flags, BGP_FLAG_ENFORCE_FIRST_AS)) {
|
||||
SET_FLAG(peer->flags_invert, PEER_FLAG_ENFORCE_FIRST_AS);
|
||||
SET_FLAG(peer->flags, PEER_FLAG_ENFORCE_FIRST_AS);
|
||||
}
|
||||
|
||||
if (CHECK_FLAG(bgp->flags, BGP_FLAG_SOFT_VERSION_CAPABILITY))
|
||||
peer_flag_set(peer, PEER_FLAG_CAPABILITY_SOFT_VERSION);
|
||||
|
@ -2,10 +2,12 @@
|
||||
router bgp 65001
|
||||
bgp router-id 10.10.10.1
|
||||
no bgp ebgp-requires-policy
|
||||
no bgp enforce-first-as
|
||||
neighbor 2001:db8:1::1 remote-as external
|
||||
neighbor 2001:db8:1::1 timers 3 10
|
||||
neighbor 2001:db8:1::1 timers connect 1
|
||||
neighbor pg peer-group
|
||||
neighbor pg remote-as external
|
||||
neighbor pg timers 1 3
|
||||
neighbor pg timers connect 1
|
||||
no neighbor pg enforce-first-as
|
||||
neighbor 2001:db8:1::1 peer-group pg
|
||||
address-family ipv6 unicast
|
||||
redistribute connected
|
||||
neighbor 2001:db8:1::1 activate
|
||||
|
Loading…
Reference in New Issue
Block a user