diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2025-01-09 10:26:02 +0100 |
|---|---|---|
| committer | Philippe Guibert <philippe.guibert@6wind.com> | 2025-01-21 13:48:36 +0100 |
| commit | 3a921c6a1d32cdc082714b4337bcb3ac3486d5ec (patch) | |
| tree | 03adf23cde34e30c104f1e083222e666da19b2c1 | |
| parent | bgpd: fix duplicate BGP instance created with unified config (diff) | |
| download | frr-3a921c6a1d32cdc082714b4337bcb3ac3486d5ec.tar.xz frr-3a921c6a1d32cdc082714b4337bcb3ac3486d5ec.zip | |
bgpd: fix import vrf creates multiple bgp instances
The more the vrf green is referenced in the import bgp command, the more
there are instances created. The below configuration shows that the vrf
green is referenced twice, and two BGP instances of vrf green are
created.
The below configuration:
> router bgp 99
> [..]
> import vrf green
> exit
> router bgp 99 vrf blue
> [..]
> import vrf green
> exit
> router bgp 99 vrf green
> [..]
> exit
>
> r4# show bgp vrfs
> Type Id routerId #PeersCfg #PeersEstb Name
> L3-VNI RouterMAC Interface
> DFLT 0 10.0.3.4 0 0 default
> 0 00:00:00:00:00:00 unknown
> VRF 5 10.0.40.4 0 0 blue
> 0 00:00:00:00:00:00 unknown
> VRF 6 0.0.0.0 0 0 green
> 0 00:00:00:00:00:00 unknown
> VRF 6 10.0.94.4 0 0 green
> 0 00:00:00:00:00:00 unknown
Fix this at import command, by looking at an already present bgp
instance.
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
| -rw-r--r-- | bgpd/bgp_vty.c | 2 | ||||
| -rw-r--r-- | bgpd/bgpd.c | 2 | ||||
| -rw-r--r-- | bgpd/bgpd.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 8fefbeb49..3e71a8948 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -10561,7 +10561,7 @@ DEFPY(bgp_imexport_vrf, bgp_imexport_vrf_cmd, SET_FLAG(bgp_default->flags, BGP_FLAG_INSTANCE_HIDDEN); } - vrf_bgp = bgp_lookup_by_name(import_name); + vrf_bgp = bgp_lookup_by_name_filter(import_name, false); 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 c45690a79..d5463f3d0 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3634,7 +3634,7 @@ struct bgp *bgp_lookup(as_t as, const char *name) } /* Lookup BGP structure by view name. */ -static struct bgp *bgp_lookup_by_name_filter(const char *name, bool filter_auto) +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 9a1ac6cc7..96a78e666 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -2285,6 +2285,7 @@ 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); |