From 1515a59202280933936b41c4cb2cb11c7889b279 Mon Sep 17 00:00:00 2001 From: Alexander Skorichenko Date: Sat, 1 Feb 2025 01:52:17 +0100 Subject: [PATCH] bgpd: update AS value of a hidden bgp instance 'import vrf VRF' could define a hidden bgp instance with the default AS_UNSPECIFIED (i.e. = 1) value. When a router bgp AS vrf VRF gets configured later on, replace this AS_UNSPECIFIED setting with a requested value. Fixes: 9680831518 ("bgpd: fix as_pretty mem leaks when un-hiding") Signed-off-by: Alexander Skorichenko Signed-off-by: Louis Scalbert --- bgpd/bgpd.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index a6165a71e0..2d240a01e1 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3412,13 +3412,15 @@ static struct bgp *bgp_create(as_t *as, const char *name, afi_t afi; safi_t safi; - if (hidden) { + if (hidden) bgp = bgp_old; - goto peer_init; - } + else + bgp = XCALLOC(MTYPE_BGP, sizeof(struct bgp)); - bgp = XCALLOC(MTYPE_BGP, sizeof(struct bgp)); bgp->as = *as; + + if (bgp->as_pretty) + XFREE(MTYPE_BGP_NAME, bgp->as_pretty); if (as_pretty) bgp->as_pretty = XSTRDUP(MTYPE_BGP_NAME, as_pretty); else @@ -3430,6 +3432,9 @@ static struct bgp *bgp_create(as_t *as, const char *name, } else asn_str2asn_notation(bgp->as_pretty, NULL, &bgp->asnotation); + if (hidden) + goto peer_init; + if (BGP_DEBUG(zebra, ZEBRA)) { if (inst_type == BGP_INSTANCE_TYPE_DEFAULT) zlog_debug("Creating Default VRF, AS %s", -- 2.39.5