From 0ade422bdf1b87a548194399686aa3c39e68535c Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Sun, 21 Apr 2024 14:16:49 +0300 Subject: [PATCH 1/2] bgpd: Inherit `enforce-first-as` flag from the peer-group Signed-off-by: Donatas Abraitis --- bgpd/bgpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 1a03a06844..f0b08a4c75 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1537,7 +1537,7 @@ 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)) - SET_FLAG(peer->flags, PEER_FLAG_ENFORCE_FIRST_AS); + peer_flag_set(peer, PEER_FLAG_ENFORCE_FIRST_AS); if (CHECK_FLAG(bgp->flags, BGP_FLAG_SOFT_VERSION_CAPABILITY)) SET_FLAG(peer->flags, PEER_FLAG_CAPABILITY_SOFT_VERSION); From 7f53f996e1bb6f5aa80145dee42684b91f7b24c1 Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Sun, 21 Apr 2024 14:18:39 +0300 Subject: [PATCH 2/2] bgpd: Inherit `capability software-version` flag from the peer-group Signed-off-by: Donatas Abraitis --- bgpd/bgpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index f0b08a4c75..a0b6cfb500 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1540,7 +1540,7 @@ struct peer *peer_new(struct bgp *bgp) peer_flag_set(peer, PEER_FLAG_ENFORCE_FIRST_AS); if (CHECK_FLAG(bgp->flags, BGP_FLAG_SOFT_VERSION_CAPABILITY)) - SET_FLAG(peer->flags, PEER_FLAG_CAPABILITY_SOFT_VERSION); + peer_flag_set(peer, PEER_FLAG_CAPABILITY_SOFT_VERSION); SET_FLAG(peer->flags_invert, PEER_FLAG_CAPABILITY_FQDN); SET_FLAG(peer->flags, PEER_FLAG_CAPABILITY_FQDN);