proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-12 03:44:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: RP code indentation adjustment

Browse Source 
Need to fix some bits here and running into the "80-ch wall".

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2022-03-11 11:32:26 +01:00
parent 543a26848d
commit 243e02abae
1 changed files with 82 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pimd/pim_rp.c
View File

@ -1171,9 +1171,11 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
vty_out(vty, vty_out(vty,
"RP address group/prefix-list OIF I am RP Source\n"); "RP address group/prefix-list OIF I am RP Source\n");
for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) { for (ALL_LIST_ELEMENTS_RO(pim->rp_list, node, rp_info)) {
if (!pim_rpf_addr_is_inaddr_any(&rp_info->rp)) {
char buf[48]; char buf[48];
if (pim_rpf_addr_is_inaddr_any(&rp_info->rp))
continue;
if (rp_info->rp_src == RP_SRC_STATIC) if (rp_info->rp_src == RP_SRC_STATIC)
strlcpy(source, "Static", sizeof(source)); strlcpy(source, "Static", sizeof(source));
else if (rp_info->rp_src == RP_SRC_BSR) else if (rp_info->rp_src == RP_SRC_BSR)
@ -1185,16 +1187,13 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
* If we have moved on to a new RP then add the * If we have moved on to a new RP then add the
* entry for the previous RP * entry for the previous RP
*/ */
if (prev_rp_info if (prev_rp_info &&
&& prev_rp_info->rp.rpf_addr.u.prefix4 prev_rp_info->rp.rpf_addr.u.prefix4.s_addr !=
.s_addr rp_info->rp.rpf_addr.u.prefix4.s_addr) {
!= rp_info->rp.rpf_addr.u.prefix4
.s_addr) {
json_object_object_add( json_object_object_add(
json, json,
inet_ntop(AF_INET, inet_ntop(AF_INET,
&prev_rp_info->rp &prev_rp_info->rp.rpf_addr.u
.rpf_addr.u
.prefix4, .prefix4,
buf, sizeof(buf)), buf, sizeof(buf)),
json_rp_rows); json_rp_rows);
@ -1214,40 +1213,35 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
rp_info->rp.source_nexthop rp_info->rp.source_nexthop
.interface->name); .interface->name);
else else
json_object_string_add( json_object_string_add(json_row,
json_row, "outboundInterface", "outboundInterface",
"Unknown"); "Unknown");
if (rp_info->i_am_rp) if (rp_info->i_am_rp)
json_object_boolean_true_add(json_row, json_object_boolean_true_add(json_row, "iAmRP");
"iAmRP");
else else
json_object_boolean_false_add(json_row, json_object_boolean_false_add(json_row,
"iAmRP"); "iAmRP");
if (rp_info->plist) if (rp_info->plist)
json_object_string_add(json_row, json_object_string_add(json_row, "prefixList",
"prefixList",
rp_info->plist); rp_info->plist);
else else
json_object_string_addf( json_object_string_addf(json_row, "group",
json_row, "group", "%pFX", "%pFX",
&rp_info->group); &rp_info->group);
json_object_string_add(json_row, "source", json_object_string_add(json_row, "source", source);
source);
json_object_array_add(json_rp_rows, json_row); json_object_array_add(json_rp_rows, json_row);
} else { } else {
vty_out(vty, "%-15s ", vty_out(vty, "%-15s ",
inet_ntop(AF_INET, inet_ntop(AF_INET,
&rp_info->rp.rpf_addr.u &rp_info->rp.rpf_addr.u.prefix4, buf,
.prefix4, sizeof(buf)));
buf, sizeof(buf)));
if (rp_info->plist) if (rp_info->plist)
vty_out(vty, "%-18s ", rp_info->plist); vty_out(vty, "%-18s ", rp_info->plist);
else else
vty_out(vty, "%-18pFX ", vty_out(vty, "%-18pFX ", &rp_info->group);
&rp_info->group);
if (rp_info->rp.source_nexthop.interface) if (rp_info->rp.source_nexthop.interface)
vty_out(vty, "%-16s ", vty_out(vty, "%-16s ",
@ -1265,7 +1259,6 @@ void pim_rp_show_information(struct pim_instance *pim, struct vty *vty, bool uj)
} }
prev_rp_info = rp_info; prev_rp_info = rp_info;
} }
}
if (uj) { if (uj) {
if (prev_rp_info && json_rp_rows) if (prev_rp_info && json_rp_rows)