proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 05:58:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12990 from opensourcerouting/fix/rename_bgp_afi_node_lookup

Browse Source 
bgpd: Drop afi from lookup functions (not used)
This commit is contained in:
Russ White 2023-03-14 10:16:16 -04:00 committed by GitHub
commit 52b5aeed95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_bmp.c
View File

@ -1175,8 +1175,8 @@ static bool bmp_wrqueue(struct bmp *bmp, struct pullwr *pullwr)
(bqe->safi == SAFI_MPLS_VPN); (bqe->safi == SAFI_MPLS_VPN);
struct prefix_rd *prd = is_vpn ? &bqe->rd : NULL; struct prefix_rd *prd = is_vpn ? &bqe->rd : NULL;
bn = bgp_afi_node_lookup(bmp->targets->bgp->rib[afi][safi], afi, safi, bn = bgp_safi_node_lookup(bmp->targets->bgp->rib[afi][safi], safi,
&bqe->p, prd); &bqe->p, prd);
if (bmp->targets->afimon[afi][safi] & BMP_MON_POSTPOLICY) { if (bmp->targets->afimon[afi][safi] & BMP_MON_POSTPOLICY) {

24
bgpd/bgp_evpn.c
View File

@ -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. * Wrapper for node lookup in global table.
*/ */
struct bgp_dest * struct bgp_dest *bgp_evpn_global_node_lookup(
bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi, struct bgp_table *table, safi_t safi, const struct prefix_evpn *evp,
const struct prefix_evpn *evp, struct prefix_rd *prd, const struct bgp_path_info *local_pi)
struct prefix_rd *prd,
const struct bgp_path_info *local_pi)
{ {
struct prefix_evpn global_p; 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; 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. * L3VPN routes.
*/ */
global_dest = bgp_evpn_global_node_lookup( 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), (const struct prefix_evpn *)bgp_dest_get_prefix(dest),
&vpn->prd, old_local); &vpn->prd, old_local);
if (global_dest) { if (global_dest) {
@ -2260,8 +2258,8 @@ static int delete_evpn_type5_route(struct bgp *bgp_vrf, struct prefix_evpn *evp)
return 0; return 0;
/* locate the global route entry for this type-5 prefix */ /* locate the global route entry for this type-5 prefix */
dest = bgp_evpn_global_node_lookup(bgp_evpn->rib[afi][safi], afi, safi, dest = bgp_evpn_global_node_lookup(bgp_evpn->rib[afi][safi], safi, evp,
evp, &bgp_vrf->vrf_prd, NULL); &bgp_vrf->vrf_prd, NULL);
if (!dest) if (!dest)
return 0; 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 * this table is a 2-level tree (RD-level + Prefix-level) similar to
* L3VPN routes. * L3VPN routes.
*/ */
global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi, global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, p,
safi, p, &vpn->prd, NULL); &vpn->prd, NULL);
if (global_dest) { if (global_dest) {
/* Delete route entry in the global EVPN table. */ /* Delete route entry in the global EVPN table. */
delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi); 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. */ /* Remove type-3 route for this VNI from global table. */
build_evpn_type3_prefix(&p, vpn->originator_ip); build_evpn_type3_prefix(&p, vpn->originator_ip);
global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], afi, global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, &p,
safi, &p, &vpn->prd, NULL); &vpn->prd, NULL);
if (global_dest) { if (global_dest) {
/* Delete route entry in the global EVPN table. */ /* Delete route entry in the global EVPN table. */
delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi); delete_evpn_route_entry(bgp, afi, safi, global_dest, &pi);

4
bgpd/bgp_evpn_mh.c
View File

@ -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. /* Next, locate route node in the global EVPN routing table.
* Note that this table is a 2-level tree (RD-level + Prefix-level) * 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, global_dest = bgp_evpn_global_node_lookup(bgp->rib[afi][safi], safi, p,
safi, p, prd, NULL); prd, NULL);
if (global_dest) { if (global_dest) {
/* Delete route entry in the global EVPN table. */ /* Delete route entry in the global EVPN table. */

8
bgpd/bgp_evpn_private.h
View File

@ -712,11 +712,9 @@ extern struct bgp_dest *
bgp_evpn_global_node_get(struct bgp_table *table, afi_t afi, safi_t safi, 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 prefix_evpn *evp, struct prefix_rd *prd,
const struct bgp_path_info *local_pi); const struct bgp_path_info *local_pi);
extern struct bgp_dest * extern struct bgp_dest *bgp_evpn_global_node_lookup(
bgp_evpn_global_node_lookup(struct bgp_table *table, afi_t afi, safi_t safi, struct bgp_table *table, safi_t safi, const struct prefix_evpn *evp,
const struct prefix_evpn *evp, struct prefix_rd *prd, const struct bgp_path_info *local_pi);
struct prefix_rd *prd,
const struct bgp_path_info *local_pi);
extern struct bgp_dest * extern struct bgp_dest *
bgp_evpn_vni_ip_node_get(struct bgp_table *const table, bgp_evpn_vni_ip_node_get(struct bgp_table *const table,
const struct prefix_evpn *evp, const struct prefix_evpn *evp,

10
bgpd/bgp_evpn_vty.c
View File

@ -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. */ /* See if route exists. Look for both non-sticky and sticky. */
build_evpn_type2_prefix(&p, mac, ip); build_evpn_type2_prefix(&p, mac, ip);
dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi, dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi,
(struct prefix *)&p, prd); (struct prefix *)&p, prd);
if (!dest || !bgp_dest_has_bgp_path_info_data(dest)) { if (!dest || !bgp_dest_has_bgp_path_info_data(dest)) {
if (!json) if (!json)
vty_out(vty, "%% Network not in table\n"); 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. * then search the l2vpn evpn table for it.
*/ */
build_evpn_type2_prefix(&ep, mac, ip); build_evpn_type2_prefix(&ep, mac, ip);
dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi, dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi,
(struct prefix *)&ep, (struct prefix *)&ep,
(struct prefix_rd *)rd_destp); (struct prefix_rd *)rd_destp);
if (!dest) if (!dest)
continue; continue;

6
bgpd/bgp_route.c
View File

@ -151,9 +151,9 @@ struct bgp_dest *bgp_afi_node_get(struct bgp_table *table, afi_t afi,
return dest; return dest;
} }
struct bgp_dest *bgp_afi_node_lookup(struct bgp_table *table, afi_t afi, struct bgp_dest *bgp_safi_node_lookup(struct bgp_table *table, safi_t safi,
safi_t safi, const struct prefix *p, const struct prefix *p,
struct prefix_rd *prd) struct prefix_rd *prd)
{ {
struct bgp_dest *dest; struct bgp_dest *dest;
struct bgp_dest *pdest = NULL; struct bgp_dest *pdest = NULL;

7
bgpd/bgp_route.h
View File

@ -819,9 +819,10 @@ extern void bgp_peer_clear_node_queue_drain_immediate(struct peer *peer);
extern void bgp_process_queues_drain_immediate(void); extern void bgp_process_queues_drain_immediate(void);
/* for encap/vpn */ /* for encap/vpn */
extern struct bgp_dest *bgp_afi_node_lookup(struct bgp_table *table, afi_t afi, extern struct bgp_dest *bgp_safi_node_lookup(struct bgp_table *table,
safi_t safi, const struct prefix *p, safi_t safi,
struct prefix_rd *prd); const struct prefix *p,
struct prefix_rd *prd);
extern void bgp_path_info_restore(struct bgp_dest *dest, extern void bgp_path_info_restore(struct bgp_dest *dest,
struct bgp_path_info *path); struct bgp_path_info *path);

4
bgpd/bgp_updgrp_adv.c
View File

@ -918,8 +918,8 @@ void subgroup_default_originate(struct update_subgroup *subgrp, int withdraw)
memset(&p, 0, sizeof(p)); memset(&p, 0, sizeof(p));
p.family = afi2family(afi); p.family = afi2family(afi);
p.prefixlen = 0; p.prefixlen = 0;
dest = bgp_afi_node_lookup(bgp->rib[afi][safi_rib], afi, safi_rib, &p, dest = bgp_safi_node_lookup(bgp->rib[afi][safi_rib], safi_rib, &p,
NULL); NULL);
if (withdraw) { if (withdraw) {
/* Withdraw the default route advertised using default /* Withdraw the default route advertised using default

4
bgpd/bgp_zebra.c
View File

@ -2596,8 +2596,8 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
} }
/* Find the bgp route node */ /* Find the bgp route node */
dest = bgp_afi_node_lookup(bgp->rib[afi][safi], afi, safi, &p, dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi, &p,
&bgp->vrf_prd); &bgp->vrf_prd);
if (!dest) if (!dest)
return -1; return -1;