proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-16 02:30:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: Cleanup some zclient clutter.

Browse Source 
The zclient code can be cleaned up a tiny bit and hopefully
improve it's indentation some.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-01-22 18:16:59 -05:00
parent 5c6580957d
commit 0d9e7f455e
1 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lib/zclient.c
View File

@ -389,25 +389,28 @@ void zclient_send_reg_requests(struct zclient *zclient, vrf_id_t vrf_id)
vrf_id); vrf_id);
/* Flush all redistribute request. */ /* Flush all redistribute request. */
if (vrf_id == VRF_DEFAULT) if (vrf_id == VRF_DEFAULT) {
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (zclient->mi_redist[afi][i].enabled) { if (!zclient->mi_redist[afi][i].enabled)
struct listnode *node; continue;
u_short *id;
for (ALL_LIST_ELEMENTS_RO( struct listnode *node;
zclient->mi_redist[afi][i] u_short *id;
.instances,
node, id)) for (ALL_LIST_ELEMENTS_RO(
if (!(i == zclient->redist_default zclient->mi_redist[afi][i]
&& *id == zclient->instance)) .instances, node, id))
zebra_redistribute_send( if (!(i == zclient->redist_default
ZEBRA_REDISTRIBUTE_ADD, && *id == zclient->instance))
zclient, afi, i, zebra_redistribute_send(
*id, ZEBRA_REDISTRIBUTE_ADD,
VRF_DEFAULT); zclient, afi, i,
} *id,
VRF_DEFAULT);
}
}
}
/* Flush all redistribute request. */ /* Flush all redistribute request. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)
@ -451,25 +454,28 @@ void zclient_send_dereg_requests(struct zclient *zclient, vrf_id_t vrf_id)
vrf_id); vrf_id);
/* Flush all redistribute request. */ /* Flush all redistribute request. */
if (vrf_id == VRF_DEFAULT) if (vrf_id == VRF_DEFAULT) {
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 0; i < ZEBRA_ROUTE_MAX; i++) for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
if (zclient->mi_redist[afi][i].enabled) { if (!zclient->mi_redist[afi][i].enabled)
struct listnode *node; continue;
u_short *id;
for (ALL_LIST_ELEMENTS_RO( struct listnode *node;
zclient->mi_redist[afi][i] u_short *id;
.instances,
node, id)) for (ALL_LIST_ELEMENTS_RO(
if (!(i == zclient->redist_default zclient->mi_redist[afi][i]
&& *id == zclient->instance)) .instances, node, id))
zebra_redistribute_send( if (!(i == zclient->redist_default
ZEBRA_REDISTRIBUTE_DELETE, && *id == zclient->instance))
zclient, afi, i, zebra_redistribute_send(
*id, ZEBRA_REDISTRIBUTE_DELETE,
VRF_DEFAULT); zclient, afi, i,
} *id,
VRF_DEFAULT);
}
}
}
/* Flush all redistribute request. */ /* Flush all redistribute request. */
for (afi = AFI_IP; afi < AFI_MAX; afi++) for (afi = AFI_IP; afi < AFI_MAX; afi++)