bgpd: Rename bgp_afi_node_lookup() to bgp_safi_node_lookup()

afi not used in this function, reduce a bit.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 92d92ada2baabb92efb15293cf06cb38f23280a1..40a27cad70f1a3fb5115b61edcf61da8602c4814 100644 (file)
--- 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 11e38aa0337ea598019610f1d1cc09e385b40107..a7b96a23b8cb67e8a26c62c134bd48c54f798f12 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -709,7 +709,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);
 }
 
 /*

diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index e28a8c8057ed1dc3c847fcd1257066ca84aafe85..c1bcbf77ce7554257118d3c46345b7ef77fe5ab6 100644 (file)
--- 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 56f548bfd5483ea6bfc60f4a1ed09f14505785e9..d8edc81b6fa246fa7a7aca7cbd9bc15e9bf3e0f1 100644 (file)
--- 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 66cc62ab090f5f708d1fdde743c126d0cd938790..775568770091e41a2cd53c74b294412a0a285df5 100644 (file)
--- 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 aa312125764340508a1e93de2b72c48664f253ae..d8e0e7875cef4fc44bf4bcfe134df069f1cdf0ea 100644 (file)
--- 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