bgpd: Ensure correct flags when inheriting config from a peer group

When a peer is a peer-group based peer, and the config is inherited from the peer group, let's ensure that the CONFIG_NODE flag stays no matter what. Signed-off-by: Donald Sharp <[email protected]>
donaldsharp · Dec 2, 2022 · 6529cbc · 6529cbc
1 parent e61486f
commit 6529cbc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
@@ -2649,6 +2649,7 @@ static void peer_group2peer_config_copy(struct peer_group *group,
 {
 	uint32_t flags_tmp;
 	struct peer *conf;
+	bool config_node = !!CHECK_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE);
 
 	conf = group->conf;
 
@@ -2676,6 +2677,9 @@ static void peer_group2peer_config_copy(struct peer_group *group,
 	SET_FLAG(peer->flags, flags_tmp);
 	SET_FLAG(peer->flags_invert, conf->flags_invert);
 
+	if (config_node)
+		SET_FLAG(peer->flags, PEER_FLAG_CONFIG_NODE);
+
 	/* peer timers apply */
 	if (!CHECK_FLAG(peer->flags_override, PEER_FLAG_TIMER)) {
 		PEER_ATTR_INHERIT(peer, group, holdtime);