proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 22:10:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Convert to struct zebra_vtep as per our internal standard

Browse Source 
We do not use typedef's to talk about structures as per our standard.
Fixing.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-08-19 16:13:39 -04:00
parent f6371c343a
commit c172c032ef
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zebra/zebra_evpn.c
View File

@ -102,7 +102,7 @@ int advertise_svi_macip_enabled(struct zebra_evpn *zevpn)
void zebra_evpn_print(struct zebra_evpn *zevpn, void **ctxt) void zebra_evpn_print(struct zebra_evpn *zevpn, void **ctxt)
{ {
struct vty *vty; struct vty *vty;
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
uint32_t num_macs; uint32_t num_macs;
uint32_t num_neigh; uint32_t num_neigh;
json_object *json = NULL; json_object *json = NULL;
@ -218,7 +218,7 @@ void zebra_evpn_print_hash(struct hash_bucket *bucket, void *ctxt[])
{ {
struct vty *vty; struct vty *vty;
struct zebra_evpn *zevpn; struct zebra_evpn *zevpn;
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
uint32_t num_vteps = 0; uint32_t num_vteps = 0;
uint32_t num_macs = 0; uint32_t num_macs = 0;
uint32_t num_neigh = 0; uint32_t num_neigh = 0;
@ -1171,7 +1171,8 @@ int zebra_evpn_send_del_to_client(struct zebra_evpn *zevpn)
/* /*
* See if remote VTEP matches with prefix. * See if remote VTEP matches with prefix.
*/ */
static int zebra_evpn_vtep_match(struct in_addr *vtep_ip, zebra_vtep_t *zvtep) static int zebra_evpn_vtep_match(struct in_addr *vtep_ip,
struct zebra_vtep *zvtep)
{ {
return (IPV4_ADDR_SAME(vtep_ip, &zvtep->vtep_ip)); return (IPV4_ADDR_SAME(vtep_ip, &zvtep->vtep_ip));
} }
@ -1179,10 +1180,10 @@ static int zebra_evpn_vtep_match(struct in_addr *vtep_ip, zebra_vtep_t *zvtep)
/* /*
* Locate remote VTEP in EVPN hash table. * Locate remote VTEP in EVPN hash table.
*/ */
zebra_vtep_t *zebra_evpn_vtep_find(struct zebra_evpn *zevpn, struct zebra_vtep *zebra_evpn_vtep_find(struct zebra_evpn *zevpn,
struct in_addr *vtep_ip) struct in_addr *vtep_ip)
{ {
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
if (!zevpn) if (!zevpn)
return NULL; return NULL;
@ -1198,13 +1199,14 @@ zebra_vtep_t *zebra_evpn_vtep_find(struct zebra_evpn *zevpn,
/* /*
* Add remote VTEP to EVPN hash table. * Add remote VTEP to EVPN hash table.
*/ */
zebra_vtep_t *zebra_evpn_vtep_add(struct zebra_evpn *zevpn, struct zebra_vtep *zebra_evpn_vtep_add(struct zebra_evpn *zevpn,
struct in_addr *vtep_ip, int flood_control) struct in_addr *vtep_ip,
int flood_control)
{ {
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
zvtep = XCALLOC(MTYPE_ZEVPN_VTEP, sizeof(zebra_vtep_t)); zvtep = XCALLOC(MTYPE_ZEVPN_VTEP, sizeof(struct zebra_vtep));
zvtep->vtep_ip = *vtep_ip; zvtep->vtep_ip = *vtep_ip;
zvtep->flood_control = flood_control; zvtep->flood_control = flood_control;
@ -1220,7 +1222,7 @@ zebra_vtep_t *zebra_evpn_vtep_add(struct zebra_evpn *zevpn,
/* /*
* Remove remote VTEP from EVPN hash table. * Remove remote VTEP from EVPN hash table.
*/ */
int zebra_evpn_vtep_del(struct zebra_evpn *zevpn, zebra_vtep_t *zvtep) int zebra_evpn_vtep_del(struct zebra_evpn *zevpn, struct zebra_vtep *zvtep)
{ {
if (zvtep->next) if (zvtep->next)
zvtep->next->prev = zvtep->prev; zvtep->next->prev = zvtep->prev;
@ -1241,7 +1243,7 @@ int zebra_evpn_vtep_del(struct zebra_evpn *zevpn, zebra_vtep_t *zvtep)
*/ */
int zebra_evpn_vtep_del_all(struct zebra_evpn *zevpn, int uninstall) int zebra_evpn_vtep_del_all(struct zebra_evpn *zevpn, int uninstall)
{ {
zebra_vtep_t *zvtep, *zvtep_next; struct zebra_vtep *zvtep, *zvtep_next;
if (!zevpn) if (!zevpn)
return -1; return -1;
@ -1260,7 +1262,7 @@ int zebra_evpn_vtep_del_all(struct zebra_evpn *zevpn, int uninstall)
* Install remote VTEP into the kernel if the remote VTEP has asked * Install remote VTEP into the kernel if the remote VTEP has asked
* for head-end-replication. * for head-end-replication.
*/ */
int zebra_evpn_vtep_install(struct zebra_evpn *zevpn, zebra_vtep_t *zvtep) int zebra_evpn_vtep_install(struct zebra_evpn *zevpn, struct zebra_vtep *zvtep)
{ {
if (is_vxlan_flooding_head_end() && if (is_vxlan_flooding_head_end() &&
(zvtep->flood_control == VXLAN_FLOOD_HEAD_END_REPL)) { (zvtep->flood_control == VXLAN_FLOOD_HEAD_END_REPL)) {
@ -1299,7 +1301,7 @@ void zebra_evpn_handle_flooding_remote_vteps(struct hash_bucket *bucket,
void *zvrf) void *zvrf)
{ {
struct zebra_evpn *zevpn; struct zebra_evpn *zevpn;
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
zevpn = (struct zebra_evpn *)bucket->data; zevpn = (struct zebra_evpn *)bucket->data;
if (!zevpn) if (!zevpn)
@ -1391,7 +1393,7 @@ void zebra_evpn_rem_macip_add(vni_t vni, const struct ethaddr *macaddr,
struct in_addr vtep_ip, const esi_t *esi) struct in_addr vtep_ip, const esi_t *esi)
{ {
struct zebra_evpn *zevpn; struct zebra_evpn *zevpn;
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
zebra_mac_t *mac = NULL; zebra_mac_t *mac = NULL;
struct interface *ifp = NULL; struct interface *ifp = NULL;
struct zebra_if *zif = NULL; struct zebra_if *zif = NULL;

21
zebra/zebra_evpn.h
View File

@ -38,8 +38,6 @@
extern "C" { extern "C" {
#endif #endif
typedef struct zebra_vtep_t_ zebra_vtep_t;
RB_HEAD(zebra_es_evi_rb_head, zebra_evpn_es_evi); RB_HEAD(zebra_es_evi_rb_head, zebra_evpn_es_evi);
RB_PROTOTYPE(zebra_es_evi_rb_head, zebra_evpn_es_evi, rb_node, RB_PROTOTYPE(zebra_es_evi_rb_head, zebra_evpn_es_evi, rb_node,
zebra_es_evi_rb_cmp); zebra_es_evi_rb_cmp);
@ -57,7 +55,7 @@ struct zebra_evpn_show {
* *
* Right now, this just has each remote VTEP's IP address. * Right now, this just has each remote VTEP's IP address.
*/ */
struct zebra_vtep_t_ { struct zebra_vtep {
/* Remote IP. */ /* Remote IP. */
/* NOTE: Can only be IPv4 right now. */ /* NOTE: Can only be IPv4 right now. */
struct in_addr vtep_ip; struct in_addr vtep_ip;
@ -67,8 +65,8 @@ struct zebra_vtep_t_ {
int flood_control; int flood_control;
/* Links. */ /* Links. */
struct zebra_vtep_t_ *next; struct zebra_vtep *next;
struct zebra_vtep_t_ *prev; struct zebra_vtep *prev;
}; };
/* /*
@ -101,7 +99,7 @@ struct zebra_evpn {
struct interface *svi_if; struct interface *svi_if;
/* List of remote VTEPs */ /* List of remote VTEPs */
zebra_vtep_t *vteps; struct zebra_vtep *vteps;
/* Local IP */ /* Local IP */
struct in_addr local_vtep_ip; struct in_addr local_vtep_ip;
@ -194,13 +192,14 @@ struct zebra_evpn *zebra_evpn_add(vni_t vni);
int zebra_evpn_del(struct zebra_evpn *zevpn); int zebra_evpn_del(struct zebra_evpn *zevpn);
int zebra_evpn_send_add_to_client(struct zebra_evpn *zevpn); int zebra_evpn_send_add_to_client(struct zebra_evpn *zevpn);
int zebra_evpn_send_del_to_client(struct zebra_evpn *zevpn); int zebra_evpn_send_del_to_client(struct zebra_evpn *zevpn);
zebra_vtep_t *zebra_evpn_vtep_find(struct zebra_evpn *zevpn, struct zebra_vtep *zebra_evpn_vtep_find(struct zebra_evpn *zevpn,
struct in_addr *vtep_ip); struct in_addr *vtep_ip);
zebra_vtep_t *zebra_evpn_vtep_add(struct zebra_evpn *zevpn, struct zebra_vtep *zebra_evpn_vtep_add(struct zebra_evpn *zevpn,
struct in_addr *vtep_ip, int flood_control); struct in_addr *vtep_ip,
int zebra_evpn_vtep_del(struct zebra_evpn *zevpn, zebra_vtep_t *zvtep); int flood_control);
int zebra_evpn_vtep_del(struct zebra_evpn *zevpn, struct zebra_vtep *zvtep);
int zebra_evpn_vtep_del_all(struct zebra_evpn *zevpn, int uninstall); int zebra_evpn_vtep_del_all(struct zebra_evpn *zevpn, int uninstall);
int zebra_evpn_vtep_install(struct zebra_evpn *zevpn, zebra_vtep_t *zvtep); int zebra_evpn_vtep_install(struct zebra_evpn *zevpn, struct zebra_vtep *zvtep);
int zebra_evpn_vtep_uninstall(struct zebra_evpn *zevpn, int zebra_evpn_vtep_uninstall(struct zebra_evpn *zevpn,
struct in_addr *vtep_ip); struct in_addr *vtep_ip);
void zebra_evpn_handle_flooding_remote_vteps(struct hash_bucket *bucket, void zebra_evpn_handle_flooding_remote_vteps(struct hash_bucket *bucket,

2
zebra/zebra_evpn_mh.h
View File

@ -168,7 +168,7 @@ struct zebra_evpn_es_vtep {
uint8_t df_alg; uint8_t df_alg;
uint32_t df_pref; uint32_t df_pref;
/* XXX - maintain a backpointer to zebra_vtep_t */ /* XXX - maintain a backpointer to struct zebra_vtep */
}; };
/* Local/access-side broadcast domain - zebra_evpn_access_bd is added to - /* Local/access-side broadcast domain - zebra_evpn_access_bd is added to -

6
zebra/zebra_vxlan.c
View File

@ -3938,7 +3938,7 @@ int zebra_vxlan_check_readd_vtep(struct interface *ifp,
struct zebra_l2info_vxlan *vxl; struct zebra_l2info_vxlan *vxl;
vni_t vni; vni_t vni;
struct zebra_evpn *zevpn = NULL; struct zebra_evpn *zevpn = NULL;
zebra_vtep_t *zvtep = NULL; struct zebra_vtep *zvtep = NULL;
zif = ifp->info; zif = ifp->info;
assert(zif); assert(zif);
@ -4271,7 +4271,7 @@ void zebra_vxlan_remote_vtep_del(vrf_id_t vrf_id, vni_t vni,
struct in_addr vtep_ip) struct in_addr vtep_ip)
{ {
struct zebra_evpn *zevpn; struct zebra_evpn *zevpn;
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
struct interface *ifp; struct interface *ifp;
struct zebra_if *zif; struct zebra_if *zif;
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
@ -4337,7 +4337,7 @@ void zebra_vxlan_remote_vtep_add(vrf_id_t vrf_id, vni_t vni,
struct zebra_evpn *zevpn; struct zebra_evpn *zevpn;
struct interface *ifp; struct interface *ifp;
struct zebra_if *zif; struct zebra_if *zif;
zebra_vtep_t *zvtep; struct zebra_vtep *zvtep;
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
if (!is_evpn_enabled()) { if (!is_evpn_enabled()) {