From af717344a6017f937e5b920b9b0cf5539d9a48ea Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 30 Nov 2022 10:41:54 -0500 Subject: [PATCH] bgpd: When copying from src to dest do not overwrite the CONFIG_NODE When the decision has been made to copy a peer configuration from a peer to another peer because one is taking over. Do not automatically set the CONFIG_NODE flag. Instead we need to handle that appropriately when the final decision is made to transfer. Signed-off-by: Donald Sharp --- bgpd/bgpd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index b04ee2dd54..e83ea2b460 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -1457,7 +1457,10 @@ void peer_xfer_config(struct peer *peer_dst, struct peer *peer_src) /* peer flags apply */ peer_dst->flags = peer_src->flags; - + /* + * The doppelganger *must* not have a config node stored + */ + UNSET_FLAG(peer_dst->flags, PEER_FLAG_CONFIG_NODE); peer_dst->peer_gr_present_state = peer_src->peer_gr_present_state; peer_dst->peer_gr_new_status_flag = peer_src->peer_gr_new_status_flag;