From: Loïc Sang <loic.sang@6wind.com>
Date: Tue, 18 Mar 2025 16:39:03 +0000 (+0100)
Subject: bgpd:  fix "delete in progress" flag on default instance
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8dc9eacb837c4dfb3c100a856932513343c31549;p=matthieu%2Ffrr.git

bgpd:  fix "delete in progress" flag on default instance

Since 4d0e7a4 ("bgpd: VRF-Lite fix default BGP delete"), upon deletion
of the default instance, it is marked as hidden and the "deletion
in progress" flag is set. When the instance is restored, some routes
are not installed due to the presence of this flag.

Fixes: 4d0e7a4 ("bgpd: VRF-Lite fix default bgp delete")
Signed-off-by: Loïc Sang <loic.sang@6wind.com>
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 6a56eb4598..fb1732558d 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3799,6 +3799,7 @@ int bgp_lookup_by_as_name_type(struct bgp **bgp_val, as_t *as, const char *as_pr
 						   hidden);
 					UNSET_FLAG(bgp->flags,
 						   BGP_FLAG_INSTANCE_HIDDEN);
+					UNSET_FLAG(bgp->flags, BGP_FLAG_DELETE_IN_PROGRESS);
 				} else {
 					bgp->as = *as;
 					if (force_config == false)