summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <donaldsharp72@gmail.com>2023-12-10 14:32:46 -0500
committerGitHub <noreply@github.com>2023-12-10 14:32:46 -0500
commitd41c757763b57f46d52275af5b076b47d076e8d7 (patch)
tree3cdf1a42231829835384a224ccffdebff6768e7a
parentf6864ec67d5e66f7c034de0b10a1a8809cf5e5f4 (diff)
parentec2375e089c605a510a2979dde5f180bc492c2cc (diff)
Merge pull request #14967 from opensourcerouting/fix/bgpd_enforce_first_as_peer-groups
bgpd: Respect enforce-first-as command for peer-groups according to the defaults
-rw-r--r--bgpd/bgpd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 4fa021ab93..051d920716 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1493,6 +1493,9 @@ 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);
+
/* Initialize per peer bgp GR FSM */
bgp_peer_gr_init(peer);
@@ -1920,9 +1923,6 @@ struct peer *peer_create(union sockunion *su, const char *conf_if,
}
}
- if (CHECK_FLAG(bgp->flags, BGP_FLAG_ENFORCE_FIRST_AS))
- SET_FLAG(peer->flags, PEER_FLAG_ENFORCE_FIRST_AS);
-
/* auto shutdown if configured */
if (bgp->autoshutdown)
peer_flag_set(peer, PEER_FLAG_SHUTDOWN);