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

zebra: Clean up indentation

Browse Source 
Code was hard to look at.  Clean up a bit
since I'm going to be in there.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-08-31 15:25:54 -04:00
parent ff228d2948
commit 20796bc364
1 changed files with 104 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
zebra/redistribute.c
View File

@ -509,7 +509,11 @@ int zebra_add_import_table_entry(struct route_node *rn, struct route_entry *re,
AFI_IP, re->type, &rn->p, re->nexthop, re->vrf_id, AFI_IP, re->type, &rn->p, re->nexthop, re->vrf_id,
re->tag, rmap_name); re->tag, rmap_name);
if (ret == RMAP_MATCH) { if (ret != RMAP_MATCH) {
zebra_del_import_table_entry(rn, re);
return 0;
}
if (rn->p.family == AF_INET) { if (rn->p.family == AF_INET) {
p.family = AF_INET; p.family = AF_INET;
p.prefixlen = rn->p.prefixlen; p.prefixlen = rn->p.prefixlen;
@ -531,7 +535,6 @@ int zebra_add_import_table_entry(struct route_node *rn, struct route_entry *re,
if (same) if (same)
zebra_del_import_table_entry(rn, same); zebra_del_import_table_entry(rn, same);
if (re->nexthop_num == 1) { if (re->nexthop_num == 1) {
rib_add(AFI_IP, SAFI_UNICAST, re->vrf_id, rib_add(AFI_IP, SAFI_UNICAST, re->vrf_id,
ZEBRA_ROUTE_TABLE, re->table, 0, &p, ZEBRA_ROUTE_TABLE, re->table, 0, &p,
@ -545,8 +548,7 @@ int zebra_add_import_table_entry(struct route_node *rn, struct route_entry *re,
sizeof(struct route_entry)); sizeof(struct route_entry));
newre->type = ZEBRA_ROUTE_TABLE; newre->type = ZEBRA_ROUTE_TABLE;
newre->distance = newre->distance =
zebra_import_table_distance[AFI_IP] zebra_import_table_distance[AFI_IP][re->table];
[re->table];
newre->flags = re->flags; newre->flags = re->flags;
newre->metric = re->metric; newre->metric = re->metric;
newre->mtu = re->mtu; newre->mtu = re->mtu;
@ -560,9 +562,6 @@ int zebra_add_import_table_entry(struct route_node *rn, struct route_entry *re,
NULL, newre); NULL, newre);
} }
} }
} else {
zebra_del_import_table_entry(rn, re);
}
/* DD: Add IPv6 code */ /* DD: Add IPv6 code */
return 0; return 0;
} }
@ -670,21 +669,21 @@ int zebra_import_table_config(struct vty *vty)
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 1; i < ZEBRA_KERNEL_TABLE_MAX; i++) { for (i = 1; i < ZEBRA_KERNEL_TABLE_MAX; i++) {
if (is_zebra_import_table_enabled(afi, i)) { if (!is_zebra_import_table_enabled(afi, i))
continue;
if (zebra_import_table_distance[afi][i] if (zebra_import_table_distance[afi][i]
!= ZEBRA_TABLE_DISTANCE_DEFAULT) { != ZEBRA_TABLE_DISTANCE_DEFAULT) {
vty_out(vty, vty_out(vty,
"%s import-table %d distance %d", "%s import-table %d distance %d",
afi_str[afi], i, afi_str[afi], i,
zebra_import_table_distance[afi] zebra_import_table_distance[afi][i]);
[i]);
} else { } else {
vty_out(vty, "%s import-table %d", vty_out(vty, "%s import-table %d",
afi_str[afi], i); afi_str[afi], i);
} }
rmap_name = zebra_get_import_table_route_map( rmap_name = zebra_get_import_table_route_map(afi, i);
afi, i);
if (rmap_name) if (rmap_name)
vty_out(vty, " route-map %s", vty_out(vty, " route-map %s",
rmap_name); rmap_name);
@ -693,7 +692,6 @@ int zebra_import_table_config(struct vty *vty)
write = 1; write = 1;
} }
} }
}
return write; return write;
} }
@ -709,14 +707,16 @@ void zebra_import_table_rm_update()
for (afi = AFI_IP; afi < AFI_MAX; afi++) { for (afi = AFI_IP; afi < AFI_MAX; afi++) {
for (i = 1; i < ZEBRA_KERNEL_TABLE_MAX; i++) { for (i = 1; i < ZEBRA_KERNEL_TABLE_MAX; i++) {
if (is_zebra_import_table_enabled(afi, i)) { if (!is_zebra_import_table_enabled(afi, i))
rmap_name = zebra_get_import_table_route_map( continue;
afi, i);
rmap_name = zebra_get_import_table_route_map(afi, i);
if (!rmap_name) if (!rmap_name)
return; return;
table = zebra_vrf_other_route_table( table = zebra_vrf_other_route_table(afi,
afi, i, VRF_DEFAULT); i,
VRF_DEFAULT);
for (rn = route_top(table); rn; for (rn = route_top(table); rn;
rn = route_next(rn)) { rn = route_next(rn)) {
/* For each entry in the non-default /* For each entry in the non-default
@ -747,7 +747,6 @@ void zebra_import_table_rm_update()
} }
} }
} }
}
return; return;
} }