From: Louis Scalbert <louis.scalbert@6wind.com>
Date: Fri, 14 Feb 2025 14:03:00 +0000 (+0100)
Subject: bgpd: fix leaving hidden state
X-Git-Tag: docker/10.3.0~13^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fa0b951771a6d1ed9eef2d2714c1d969e4fb5d72;p=matthieu%2Ffrr.git

bgpd: fix leaving hidden state

Upon configuration of a VRF instance that references an absent default
VRF with "import vrf default", the default instance is created in hidden
state. However, the default instance is not properly un-hidden when
configured.

Restore the behavior prior to commit below.

Fixes: 9f7177af13 ("bgpd: fix duplicate BGP instance created with unified config")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit 70e07678bfe554dd5be30a605ddf6c0fe3a8a39b)
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index d90875b78c..342c3c6be6 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3768,7 +3768,7 @@ int bgp_lookup_by_as_name_type(struct bgp **bgp_val, as_t *as, const char *as_pr
 		/* Handle AS number change */
 		if (bgp->as != *as) {
 			if (hidden || CHECK_FLAG(bgp->vrf_flags, BGP_VRF_AUTO)) {
-				if (force_config == false && hidden) {
+				if (hidden) {
 					bgp_create(as, name, inst_type,
 						   as_pretty, asnotation, bgp,
 						   hidden);