From: Louis Scalbert <louis.scalbert@6wind.com>
Date: Wed, 12 Feb 2025 11:56:49 +0000 (+0100)
Subject: bgpd: fix default instance name when un-hiding
X-Git-Tag: docker/10.3.0~13^2~6
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=64dba6b488cc9905811477bb9677c8ca2c205f6b;p=mirror%2Ffrr.git

bgpd: fix default instance name when un-hiding

When unconfiguring a default BGP instance with VPN SAFI configurations,
the default BGP structure remains but enters a hidden state. Upon
reconfiguration, the instance name incorrectly appears as "VIEW ?"
instead of "VRF default". And the name_pretty pointer

The name_pretty pointer is replaced by another one with the incorrect
name. This also leads to a memory leak as the previous pointer is not
properly freed.

Do not rewrite the instance name.

Fixes: 4d0e7a49cf ("bgpd: VRF-Lite fix default bgp delete")
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
(cherry picked from commit d2ff7e8a2117ad4bc38cec0e48c6b3c11dc49c91)
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index e3911de28a..7b60c4fc17 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3561,7 +3561,7 @@ peer_init:
 	/* printable name we can use in debug messages */
 	if (inst_type == BGP_INSTANCE_TYPE_DEFAULT && !hidden) {
 		bgp->name_pretty = XSTRDUP(MTYPE_BGP_NAME, "VRF default");
-	} else {
+	} else if (!hidden) {
 		const char *n;
 		int len;