zebra: give some evpn apis better names

Use more useful names for a few evpn apis.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-04-16 12:17:11 -04:00 committed by Mark Stapp
parent 12e1fe1251
commit 272e11bfc4
7 changed files with 31 additions and 28 deletions

View File

@ -1380,7 +1380,7 @@ zebra_evpn_process_sync_macip_add(zebra_evpn_t *zevpn, struct ethaddr *macaddr,
/************************** remote mac-ip handling **************************/
/* Process a remote MACIP add from BGP. */
void process_remote_macip_add(vni_t vni, struct ethaddr *macaddr,
void zebra_evpn_rem_macip_add(vni_t vni, struct ethaddr *macaddr,
uint16_t ipa_len, struct ipaddr *ipaddr,
uint8_t flags, uint32_t seq,
struct in_addr vtep_ip, esi_t *esi)
@ -1447,17 +1447,18 @@ void process_remote_macip_add(vni_t vni, struct ethaddr *macaddr,
return;
if (process_mac_remote_macip_add(zevpn, zvrf, macaddr, ipa_len, ipaddr,
&mac, vtep_ip, flags, seq, esi)
if (zebra_evpn_mac_remote_macip_add(zevpn, zvrf, macaddr, ipa_len,
ipaddr, &mac, vtep_ip, flags, seq,
esi)
!= 0)
return;
process_neigh_remote_macip_add(zevpn, zvrf, ipaddr, mac, vtep_ip, flags,
seq);
zebra_evpn_neigh_remote_macip_add(zevpn, zvrf, ipaddr, mac, vtep_ip,
flags, seq);
}
/* Process a remote MACIP delete from BGP. */
void process_remote_macip_del(vni_t vni, struct ethaddr *macaddr,
void zebra_evpn_rem_macip_del(vni_t vni, struct ethaddr *macaddr,
uint16_t ipa_len, struct ipaddr *ipaddr,
struct in_addr vtep_ip)
{

View File

@ -204,11 +204,11 @@ int zebra_evpn_vtep_uninstall(zebra_evpn_t *zevpn, struct in_addr *vtep_ip);
void zebra_evpn_handle_flooding_remote_vteps(struct hash_bucket *bucket,
void *zvrf);
void zebra_evpn_cleanup_all(struct hash_bucket *bucket, void *arg);
void process_remote_macip_add(vni_t vni, struct ethaddr *macaddr,
void zebra_evpn_rem_macip_add(vni_t vni, struct ethaddr *macaddr,
uint16_t ipa_len, struct ipaddr *ipaddr,
uint8_t flags, uint32_t seq,
struct in_addr vtep_ip, esi_t *esi);
void process_remote_macip_del(vni_t vni, struct ethaddr *macaddr,
void zebra_evpn_rem_macip_del(vni_t vni, struct ethaddr *macaddr,
uint16_t ipa_len, struct ipaddr *ipaddr,
struct in_addr vtep_ip);
void zebra_evpn_cfg_cleanup(struct hash_bucket *bucket, void *ctxt);

View File

@ -1958,11 +1958,11 @@ void zebra_evpn_print_dad_mac_hash_detail(struct hash_bucket *bucket,
zebra_evpn_print_mac_hash_detail(bucket, ctxt);
}
int process_mac_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
struct ethaddr *macaddr, uint16_t ipa_len,
struct ipaddr *ipaddr, zebra_mac_t **macp,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq, esi_t *esi)
int zebra_evpn_mac_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
struct ethaddr *macaddr, uint16_t ipa_len,
struct ipaddr *ipaddr, zebra_mac_t **macp,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq, esi_t *esi)
{
char buf1[INET6_ADDRSTRLEN];
bool sticky;

View File

@ -262,11 +262,11 @@ void zebra_evpn_rem_mac_del(zebra_evpn_t *zevi, zebra_mac_t *mac);
void zebra_evpn_print_dad_mac_hash(struct hash_bucket *bucket, void *ctxt);
void zebra_evpn_print_dad_mac_hash_detail(struct hash_bucket *bucket,
void *ctxt);
int process_mac_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
struct ethaddr *macaddr, uint16_t ipa_len,
struct ipaddr *ipaddr, zebra_mac_t **macp,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq, esi_t *esi);
int zebra_evpn_mac_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
struct ethaddr *macaddr, uint16_t ipa_len,
struct ipaddr *ipaddr, zebra_mac_t **macp,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq, esi_t *esi);
int zebra_evpn_add_update_local_mac(struct zebra_vrf *zvrf, zebra_evpn_t *zevpn,
struct interface *ifp,

View File

@ -2046,10 +2046,11 @@ void zebra_evpn_print_dad_neigh_hash_detail(struct hash_bucket *bucket,
zebra_evpn_print_neigh_hash_detail(bucket, ctxt);
}
void process_neigh_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
struct ipaddr *ipaddr, zebra_mac_t *mac,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq)
void zebra_evpn_neigh_remote_macip_add(zebra_evpn_t *zevpn,
struct zebra_vrf *zvrf,
struct ipaddr *ipaddr, zebra_mac_t *mac,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq)
{
zebra_neigh_t *n;
int update_neigh = 0;

View File

@ -266,10 +266,11 @@ void zebra_evpn_print_neigh_hash_detail(struct hash_bucket *bucket, void *ctxt);
void zebra_evpn_print_dad_neigh_hash(struct hash_bucket *bucket, void *ctxt);
void zebra_evpn_print_dad_neigh_hash_detail(struct hash_bucket *bucket,
void *ctxt);
void process_neigh_remote_macip_add(zebra_evpn_t *zevpn, struct zebra_vrf *zvrf,
struct ipaddr *ipaddr, zebra_mac_t *mac,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq);
void zebra_evpn_neigh_remote_macip_add(zebra_evpn_t *zevpn,
struct zebra_vrf *zvrf,
struct ipaddr *ipaddr, zebra_mac_t *mac,
struct in_addr vtep_ip, uint8_t flags,
uint32_t seq);
int zebra_evpn_neigh_gw_macip_add(struct interface *ifp, zebra_evpn_t *zevpn,
struct ipaddr *ip, zebra_mac_t *mac);
void zebra_evpn_neigh_remote_uninstall(zebra_evpn_t *zevpn,

View File

@ -3844,7 +3844,7 @@ void zebra_vxlan_remote_macip_del(ZAPI_HANDLER_ARGS)
ipaddr2str(&ip, buf1, sizeof(buf1)) : "",
&vtep_ip, zebra_route_string(client->proto));
process_remote_macip_del(vni, &macaddr, ipa_len, &ip, vtep_ip);
zebra_evpn_rem_macip_del(vni, &macaddr, ipa_len, &ip, vtep_ip);
}
stream_failure:
@ -3907,7 +3907,7 @@ void zebra_vxlan_remote_macip_add(ZAPI_HANDLER_ARGS)
zebra_route_string(client->proto));
}
process_remote_macip_add(vni, &macaddr, ipa_len, &ip,
zebra_evpn_rem_macip_add(vni, &macaddr, ipa_len, &ip,
flags, seq, vtep_ip, &esi);
}