proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-04 11:45:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5874 from donaldsharp/hash_backet2

Browse Source 
*: change hash_backet to hash_bucket
This commit is contained in:
Mark Stapp 2020-02-28 16:26:55 -05:00 committed by GitHub
commit 8105c99404
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bfdd/bfdd_vty.c
View File

@ -474,7 +474,7 @@ static void _display_peer_brief(struct vty *vty, struct bfd_session *bs)
}
}
static void _display_peer_brief_iter(struct hash_backet *hb, void *arg)
static void _display_peer_brief_iter(struct hash_bucket *hb, void *arg)
{
struct bfd_vrf_tuple *bvt = arg;
struct vty *vty;

2
bgpd/bgp_aspath.c
View File

@ -2127,7 +2127,7 @@ static void *bgp_aggr_aspath_hash_alloc(void *p)
return aspath;
}
static void bgp_aggr_aspath_prepare(struct hash_backet *hb, void *arg)
static void bgp_aggr_aspath_prepare(struct hash_bucket *hb, void *arg)
{
struct aspath *hb_aspath = hb->data;
struct aspath **aggr_aspath = arg;

2
bgpd/bgp_community.c
View File

@ -907,7 +907,7 @@ static void *bgp_aggr_communty_hash_alloc(void *p)
return community;
}
static void bgp_aggr_community_prepare(struct hash_backet *hb, void *arg)
static void bgp_aggr_community_prepare(struct hash_bucket *hb, void *arg)
{
struct community *hb_community = hb->data;
struct community **aggr_community = arg;

2
bgpd/bgp_ecommunity.c
View File

@ -1026,7 +1026,7 @@ static void *bgp_aggr_ecommunty_hash_alloc(void *p)
return ecommunity;
}
static void bgp_aggr_ecommunity_prepare(struct hash_backet *hb, void *arg)
static void bgp_aggr_ecommunity_prepare(struct hash_bucket *hb, void *arg)
{
struct ecommunity *hb_ecommunity = hb->data;
struct ecommunity **aggr_ecommunity = arg;

2
bgpd/bgp_lcommunity.c
View File

@ -550,7 +550,7 @@ static void *bgp_aggr_lcommunty_hash_alloc(void *p)
return lcommunity;
}
static void bgp_aggr_lcommunity_prepare(struct hash_backet *hb, void *arg)
static void bgp_aggr_lcommunity_prepare(struct hash_bucket *hb, void *arg)
{
struct lcommunity *hb_lcommunity = hb->data;
struct lcommunity **aggr_lcommunity = arg;

5
lib/hash.h
View File

@ -36,11 +36,6 @@ extern "C" {
#define HASHWALK_CONTINUE 0
#define HASHWALK_ABORT -1
#if CONFDATE > 20200225
CPP_NOTICE("hash.h: time to remove hash_backet #define")
#endif
#define hash_backet hash_bucket
struct hash_bucket {
/*
* if this bucket is the head of the linked listed, len denotes the

2
lib/routemap.c
View File

@ -2257,7 +2257,7 @@ static void route_map_pentry_update(route_map_event_t event,
}
}
static void route_map_pentry_process_dependency(struct hash_backet *backet,
static void route_map_pentry_process_dependency(struct hash_bucket *backet,
void *data)
{
char *rmap_name = NULL;

4
pbrd/pbr_nht.c
View File

@ -853,7 +853,7 @@ void pbr_nht_nexthop_update(struct zapi_route *nhr)
}
static void
pbr_nht_individual_nexthop_interface_update_lookup(struct hash_backet *b,
pbr_nht_individual_nexthop_interface_update_lookup(struct hash_bucket *b,
void *data)
{
struct pbr_nexthop_cache *pnhc = b->data;
@ -871,7 +871,7 @@ pbr_nht_individual_nexthop_interface_update_lookup(struct hash_backet *b,
pnhi->valid += 1;
}
static void pbr_nht_nexthop_interface_update_lookup(struct hash_backet *b,
static void pbr_nht_nexthop_interface_update_lookup(struct hash_bucket *b,
void *data)
{
struct pbr_nexthop_group_cache *pnhgc = b->data;

2
pimd/pim_cmd.c
View File

@ -10397,7 +10397,7 @@ static void pim_show_vxlan_sg_entry(struct pim_vxlan_sg *vxlan_sg,
}
}
static void pim_show_vxlan_sg_hash_entry(struct hash_backet *backet, void *arg)
static void pim_show_vxlan_sg_hash_entry(struct hash_bucket *backet, void *arg)
{
pim_show_vxlan_sg_entry((struct pim_vxlan_sg *)backet->data,
(struct pim_sg_cache_walk_data *)arg);

15
pimd/pim_vxlan.c
View File

@ -475,7 +475,7 @@ static void pim_vxlan_orig_mr_del(struct pim_vxlan_sg *vxlan_sg)
pim_vxlan_orig_mr_up_del(vxlan_sg);
}
static void pim_vxlan_orig_mr_iif_update(struct hash_backet *backet, void *arg)
static void pim_vxlan_orig_mr_iif_update(struct hash_bucket *backet, void *arg)
{
struct interface *ifp;
struct pim_vxlan_sg *vxlan_sg = (struct pim_vxlan_sg *)backet->data;
@ -788,8 +788,8 @@ bool pim_vxlan_do_mlag_reg(void)
* to the MLAG peer which may mroute it over the underlay if there are any
* interested receivers.
*/
static void pim_vxlan_sg_peerlink_oif_update(struct hash_backet *backet,
void *arg)
static void pim_vxlan_sg_peerlink_oif_update(struct hash_bucket *backet,
void *arg)
{
struct interface *new_oif = (struct interface *)arg;
struct pim_vxlan_sg *vxlan_sg = (struct pim_vxlan_sg *)backet->data;
@ -927,8 +927,7 @@ static void pim_vxlan_up_cost_update(struct pim_instance *pim,
}
}
static void pim_vxlan_term_mr_cost_update(struct hash_backet *backet,
void *arg)
static void pim_vxlan_term_mr_cost_update(struct hash_bucket *backet, void *arg)
{
struct interface *old_peerlink_rif = (struct interface *)arg;
struct pim_vxlan_sg *vxlan_sg = (struct pim_vxlan_sg *)backet->data;
@ -953,8 +952,8 @@ static void pim_vxlan_term_mr_cost_update(struct hash_backet *backet,
old_peerlink_rif);
}
static void pim_vxlan_sg_peerlink_rif_update(struct hash_backet *backet,
void *arg)
static void pim_vxlan_sg_peerlink_rif_update(struct hash_bucket *backet,
void *arg)
{
pim_vxlan_orig_mr_iif_update(backet, NULL);
pim_vxlan_term_mr_cost_update(backet, arg);
@ -1012,7 +1011,7 @@ static void pim_vxlan_set_peerlink_rif(struct pim_instance *pim,
}
}
static void pim_vxlan_term_mr_oif_update(struct hash_backet *backet, void *arg)
static void pim_vxlan_term_mr_oif_update(struct hash_bucket *backet, void *arg)
{
struct interface *ifp = (struct interface *)arg;
struct pim_vxlan_sg *vxlan_sg = (struct pim_vxlan_sg *)backet->data;

6
zebra/zebra_fpm.c
View File

@ -70,7 +70,7 @@ DEFINE_MTYPE_STATIC(ZEBRA, FPM_MAC_INFO, "FPM_MAC_INFO");
#define ZFPM_STATS_IVL_SECS 10
#define FPM_MAX_MAC_MSG_LEN 512
static void zfpm_iterate_rmac_table(struct hash_backet *backet, void *args);
static void zfpm_iterate_rmac_table(struct hash_bucket *backet, void *args);
/*
* Structure that holds state for iterating over all route_node
@ -1647,7 +1647,7 @@ static int zfpm_trigger_rmac_update(zebra_mac_t *rmac, zebra_l3vni_t *zl3vni,
* Iterate over all the RMAC entries for the given L3VNI
* and enqueue the RMAC for FPM processing.
*/
static void zfpm_trigger_rmac_update_wrapper(struct hash_backet *backet,
static void zfpm_trigger_rmac_update_wrapper(struct hash_bucket *backet,
void *args)
{
zebra_mac_t *zrmac = (zebra_mac_t *)backet->data;
@ -1661,7 +1661,7 @@ static void zfpm_trigger_rmac_update_wrapper(struct hash_backet *backet,
* This function iterates over all the L3VNIs to trigger
* FPM updates for RMACs currently available.
*/
static void zfpm_iterate_rmac_table(struct hash_backet *backet, void *args)
static void zfpm_iterate_rmac_table(struct hash_bucket *backet, void *args)
{
zebra_l3vni_t *zl3vni = (zebra_l3vni_t *)backet->data;

6
zebra/zebra_vxlan.c
View File

@ -225,7 +225,7 @@ static void zebra_vxlan_sg_deref(struct in_addr local_vtep_ip,
struct in_addr mcast_grp);
static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
struct in_addr mcast_grp);
static void zebra_vxlan_sg_cleanup(struct hash_backet *backet, void *arg);
static void zebra_vxlan_sg_cleanup(struct hash_bucket *bucket, void *arg);
static void zvni_send_mac_to_client(zebra_vni_t *zvn);
static void zvni_send_neigh_to_client(zebra_vni_t *zvni);
@ -10102,14 +10102,14 @@ static void zebra_vxlan_sg_ref(struct in_addr local_vtep_ip,
zebra_vxlan_sg_do_ref(zvrf, local_vtep_ip, mcast_grp);
}
static void zebra_vxlan_sg_cleanup(struct hash_backet *backet, void *arg)
static void zebra_vxlan_sg_cleanup(struct hash_bucket *backet, void *arg)
{
zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;
zebra_vxlan_sg_del(vxlan_sg);
}
static void zebra_vxlan_sg_replay_send(struct hash_backet *backet, void *arg)
static void zebra_vxlan_sg_replay_send(struct hash_bucket *backet, void *arg)
{
zebra_vxlan_sg_t *vxlan_sg = (zebra_vxlan_sg_t *)backet->data;