summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bgpd/bgp_bmp.c4
-rw-r--r--bgpd/bgp_evpn.c24
-rw-r--r--bgpd/bgp_evpn_mh.c4
-rw-r--r--bgpd/bgp_evpn_private.h8
-rw-r--r--bgpd/bgp_evpn_vty.c10
-rw-r--r--bgpd/bgp_route.c6
-rw-r--r--bgpd/bgp_route.h7
-rw-r--r--bgpd/bgp_updgrp_adv.c4
-rw-r--r--bgpd/bgp_zebra.c4
9 files changed, 34 insertions, 37 deletions
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 92d92ada2b..40a27cad70 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -1175,8 +1175,8 @@ static bool bmp_wrqueue(struct bmp *bmp, struct pullwr *pullwr)
(bqe->safi == SAFI_MPLS_VPN);
struct prefix_rd *prd = is_vpn ? &bqe->rd : NULL;
- bn = bgp_afi_node_lookup(bmp->targets->bgp->rib[afi][safi], afi, safi,
- &bqe->p, prd);
+ bn = bgp_safi_node_lookup(bmp->targets->bgp->rib[afi][safi], safi,
+ &bqe->p, prd);
if (bmp->targets->afimon[afi][safi] & BMP_MON_POSTPOLICY) {
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 11e38aa033..6968558681 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -674,11 +674,9 @@ struct bgp_dest *bgp_evpn_global_node_get(struct bgp_table *table, afi_t afi,
/*
* Wrapper for node lookup in global table.
*/
-struct bgp_dest *
-bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi,
- const struct prefix_evpn *evp,
- struct prefix_rd *prd,
- const struct bgp_path_info *local_pi)
+struct bgp_dest *bgp_evpn_global_node_lookup(
+ struct bgp_table *table, safi_t safi, const struct prefix_evpn *evp,
+ struct prefix_rd *prd, const struct bgp_path_info *local_pi)
{
struct prefix_evpn global_p;
@@ -709,7 +707,7 @@ bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi,
evp = &global_p;
}
- return bgp_afi_node_lookup(table, afi, safi, (struct prefix *)evp, prd);
+ return bgp_safi_node_lookup(table, safi, (struct prefix *)evp, prd);
}
/*
@@ -1358,7 +1356,7 @@ static void evpn_delete_old_local_route(struct bgp *bgp, struct bgpevpn *vpn,
* L3VPN routes.
*/
global_dest = bgp_evpn_global_node_lookup(
- bgp->rib[afi][safi], afi, safi,
+ bgp->rib[afi][safi], safi,
(const struct prefix_evpn *)bgp_dest_get_prefix(dest),
&vpn->prd, old_local);
if (global_dest) {
@@ -2260,8 +2258,8 @@ static int delete_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp)
return 0;
/* locate the global route entry for this type-5 prefix */
- dest = bgp_evpn_global_node_lookup(bgp_evpn->rib[afi][safi], afi, safi,
- evp, &bgp_vrf->vrf_prd, NULL);
+ dest = bgp_evpn_global_node_lookup(bgp_evpn->rib[afi][safi], safi, evp,
+ &bgp_vrf->vrf_prd, NULL);
if (!dest)
return 0;
@@ -2297,8 +2295,8 @@ static int delete_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
* this table is a 2-level tree (RD-level + Prefix-level) similar to
* L3VPN routes.
*/
- global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi,
- safi, p, &vpn->prd, NULL);
+ global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, p,
+ &vpn->prd, NULL);
if (global_dest) {
/* Delete route entry in the global EVPN table. */
delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi);
@@ -4317,8 +4315,8 @@ static int delete_withdraw_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
/* Remove type-3 route for this VNI from global table. */
build_evpn_type3_prefix(&p, vpn->originator_ip);
- global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi,
- safi, &p, &vpn->prd, NULL);
+ global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, &p,
+ &vpn->prd, NULL);
if (global_dest) {
/* Delete route entry in the global EVPN table. */
delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi);
diff --git a/bgpd/bgp_evpn_mh.c b/bgpd/bgp_evpn_mh.c
index 2f95023aa9..4fd0a67911 100644
--- a/bgpd/bgp_evpn_mh.c
+++ b/bgpd/bgp_evpn_mh.c
@@ -487,8 +487,8 @@ static int bgp_evpn_mh_route_delete(struct bgp *bgp, struct bgp_evpn_es *es,
/* Next, locate route node in the global EVPN routing table.
* Note that this table is a 2-level tree (RD-level + Prefix-level)
*/
- global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi,
- safi, p, prd, NULL);
+ global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, p,
+ prd, NULL);
if (global_dest) {
/* Delete route entry in the global EVPN table. */
diff --git a/bgpd/bgp_evpn_private.h b/bgpd/bgp_evpn_private.h
index fbf3b19c37..fd8d2c118f 100644
--- a/bgpd/bgp_evpn_private.h
+++ b/bgpd/bgp_evpn_private.h
@@ -712,11 +712,9 @@ extern struct bgp_dest *
bgp_evpn_global_node_get(struct bgp_table *table, afi_t afi, safi_t safi,
const struct prefix_evpn *evp, struct prefix_rd *prd,
const struct bgp_path_info *local_pi);
-extern struct bgp_dest *
-bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi,
- const struct prefix_evpn *evp,
- struct prefix_rd *prd,
- const struct bgp_path_info *local_pi);
+extern struct bgp_dest *bgp_evpn_global_node_lookup(
+ struct bgp_table *table, safi_t safi, const struct prefix_evpn *evp,
+ struct prefix_rd *prd, const struct bgp_path_info *local_pi);
extern struct bgp_dest *
bgp_evpn_vni_ip_node_get(struct bgp_table *const table,
const struct prefix_evpn *evp,
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index e28a8c8057..c1bcbf77ce 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -2716,8 +2716,8 @@ static void evpn_show_route_rd_macip(struct vty *vty, struct bgp *bgp,
/* See if route exists. Look for both non-sticky and sticky. */
build_evpn_type2_prefix(&p, mac, ip);
- dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi,
- (struct prefix *)&p, prd);
+ dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi,
+ (struct prefix *)&p, prd);
if (!dest || !bgp_dest_has_bgp_path_info_data(dest)) {
if (!json)
vty_out(vty, "%% Network not in table\n");
@@ -2946,9 +2946,9 @@ static void evpn_show_route_rd_all_macip(struct vty *vty, struct bgp *bgp,
* then search the l2vpn evpn table for it.
*/
build_evpn_type2_prefix(&ep, mac, ip);
- dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi,
- (struct prefix *)&ep,
- (struct prefix_rd *)rd_destp);
+ dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi,
+ (struct prefix *)&ep,
+ (struct prefix_rd *)rd_destp);
if (!dest)
continue;
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 4320259cc9..076e5a6cad 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -151,9 +151,9 @@ struct bgp_dest *bgp_afi_node_get(struct bgp_table *table, afi_t afi,
return dest;
}
-struct bgp_dest *bgp_afi_node_lookup(struct bgp_table *table, afi_t afi,
- safi_t safi, const struct prefix *p,
- struct prefix_rd *prd)
+struct bgp_dest *bgp_safi_node_lookup(struct bgp_table *table, safi_t safi,
+ const struct prefix *p,
+ struct prefix_rd *prd)
{
struct bgp_dest *dest;
struct bgp_dest *pdest = NULL;
diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 66cc62ab09..7755687700 100644
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -819,9 +819,10 @@ extern void bgp_peer_clear_node_queue_drain_immediate(struct peer *peer);
extern void bgp_process_queues_drain_immediate(void);
/* for encap/vpn */
-extern struct bgp_dest *bgp_afi_node_lookup(struct bgp_table *table, afi_t afi,
- safi_t safi, const struct prefix *p,
- struct prefix_rd *prd);
+extern struct bgp_dest *bgp_safi_node_lookup(struct bgp_table *table,
+ safi_t safi,
+ const struct prefix *p,
+ struct prefix_rd *prd);
extern void bgp_path_info_restore(struct bgp_dest *dest,
struct bgp_path_info *path);
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index aa31212576..d8e0e7875c 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -918,8 +918,8 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
memset(&p, 0, sizeof(p));
p.family = afi2family(afi);
p.prefixlen = 0;
- dest = bgp_afi_node_lookup(bgp->rib[afi][safi_rib], afi, safi_rib, &p,
- NULL);
+ dest = bgp_safi_node_lookup(bgp->rib[afi][safi_rib], safi_rib, &p,
+ NULL);
if (withdraw) {
/* Withdraw the default route advertised using default
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index ada1f0d263..da598993d1 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -2596,8 +2596,8 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
}
/* Find the bgp route node */
- dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi, &p,
- &bgp->vrf_prd);
+ dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi, &p,
+ &bgp->vrf_prd);
if (!dest)
return -1;
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-09 22:36:04 +0000