From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 6 Feb 2025 09:09:43 +0000 (+0200)
Subject: Revert "bgpd: fix import vrf creates multiple bgp instances"
X-Git-Tag: docker/10.1.3~24^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=1d1c6c42404544cdc05a771b3e9e6eb6f14f4e46;p=matthieu%2Ffrr.git

Revert "bgpd: fix import vrf creates multiple bgp instances"

This reverts commit 8c187fb4f838d8d8a21f8608c3a510136764b122.
---

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 9dc85e745e..9eabfb6da0 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -10440,7 +10440,7 @@ DEFPY(bgp_imexport_vrf, bgp_imexport_vrf_cmd,
 		}
 	}
 
-	vrf_bgp = bgp_lookup_by_name_filter(import_name, false);
+	vrf_bgp = bgp_lookup_by_name(import_name);
 	if (!vrf_bgp) {
 		if (strcmp(import_name, VRF_DEFAULT_NAME) == 0) {
 			vrf_bgp = bgp_default;
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 7c1be226b1..34c0eab089 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -3623,7 +3623,7 @@ struct bgp *bgp_lookup(as_t as, const char *name)
 }
 
 /* Lookup BGP structure by view name. */
-struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto)
+static struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto)
 {
 	struct bgp *bgp;
 	struct listnode *node, *nnode;
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index a565a323b5..8500f55371 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -2225,7 +2225,6 @@ extern void bgp_zclient_reset(void);
 extern struct bgp *bgp_get_default(void);
 extern struct bgp *bgp_lookup(as_t, const char *);
 extern struct bgp *bgp_lookup_by_name(const char *);
-extern struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto);
 extern struct bgp *bgp_lookup_by_vrf_id(vrf_id_t);
 extern struct bgp *bgp_get_evpn(void);
 extern void bgp_set_evpn(struct bgp *bgp);