summaryrefslogtreecommitdiff
path: root/pimd
diff options
context:
space:
mode:
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_bfd.c2
-rw-r--r--pimd/pim_cmd.c67
-rw-r--r--pimd/pim_iface.c17
-rw-r--r--pimd/pim_ifchannel.c8
-rw-r--r--pimd/pim_instance.c3
-rw-r--r--pimd/pim_vty.c3
-rw-r--r--pimd/pim_zebra.c15
-rw-r--r--pimd/pimd.c3
8 files changed, 46 insertions, 72 deletions
diff --git a/pimd/pim_bfd.c b/pimd/pim_bfd.c
index bba26662bd..314162c78b 100644
--- a/pimd/pim_bfd.c
+++ b/pimd/pim_bfd.c
@@ -300,7 +300,7 @@ static int pim_bfd_nbr_replay(int command, struct zclient *zclient,
/* Send the client registration */
bfd_client_sendmsg(zclient, ZEBRA_BFD_CLIENT_REGISTER);
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name) {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(vrf->vrf_id), node, ifp)) {
pim_ifp = ifp->info;
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 4066614f4b..1885d5a61a 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -228,7 +228,7 @@ static void pim_show_assert(struct pim_instance *pim, struct vty *vty)
if (!pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_show_assert_helper(vty, pim_ifp, ch, now);
} /* scan interface channels */
}
@@ -280,7 +280,7 @@ static void pim_show_assert_internal(struct pim_instance *pim, struct vty *vty)
if (!pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_show_assert_internal_helper(vty, pim_ifp, ch);
} /* scan interface channels */
}
@@ -329,7 +329,7 @@ static void pim_show_assert_metric(struct pim_instance *pim, struct vty *vty)
if (!pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_show_assert_metric_helper(vty, pim_ifp, ch);
} /* scan interface channels */
}
@@ -392,7 +392,7 @@ static void pim_show_assert_winner_metric(struct pim_instance *pim,
if (!pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_show_assert_winner_metric_helper(vty, pim_ifp, ch);
} /* scan interface channels */
}
@@ -482,7 +482,7 @@ static void pim_show_membership(struct pim_instance *pim, struct vty *vty,
if (!pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_show_membership_helper(vty, pim_ifp, ch, json);
} /* scan interface channels */
}
@@ -1698,9 +1698,8 @@ static void pim_show_join(struct pim_instance *pim, struct vty *vty, u_char uj)
if (!pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
- pim_show_join_helper(vty, pim_ifp,
- ch, json, now, uj);
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ pim_show_join_helper(vty, pim_ifp, ch, json, now, uj);
} /* scan interface channels */
}
@@ -2528,7 +2527,7 @@ static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty,
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
/* scan all interfaces */
pim_show_join_desired_helper(pim, vty,
pim_ifp, ch,
@@ -3393,8 +3392,7 @@ DEFUN (show_ip_igmp_interface_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -3450,8 +3448,7 @@ DEFUN (show_ip_igmp_join_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -3505,8 +3502,7 @@ DEFUN (show_ip_igmp_groups_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -3711,8 +3707,7 @@ DEFUN (show_ip_pim_interface_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -3771,8 +3766,7 @@ DEFUN (show_ip_pim_join_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -3857,8 +3851,7 @@ DEFUN (show_ip_pim_neighbor_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -3964,8 +3957,7 @@ DEFUN (show_ip_pim_state_vrf_all,
group = argv[idx + 1]->arg;
}
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -4019,8 +4011,7 @@ DEFUN (show_ip_pim_upstream_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -4116,8 +4107,7 @@ DEFUN (show_ip_pim_rp_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -4171,8 +4161,7 @@ DEFUN (show_ip_pim_rpf_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -4438,8 +4427,7 @@ DEFUN (show_ip_multicast_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -4814,8 +4802,7 @@ DEFUN (show_ip_mroute_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -4918,8 +4905,7 @@ DEFUN (show_ip_mroute_count_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -7854,8 +7840,7 @@ DEFUN (show_ip_msdp_mesh_group_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -8083,8 +8068,7 @@ DEFUN (show_ip_msdp_peer_detail_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -8313,8 +8297,7 @@ DEFUN (show_ip_msdp_sa_detail_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
@@ -8450,7 +8433,7 @@ DEFUN (show_ip_msdp_sa_sg_vrf_all,
if (uj)
vty_out(vty, "{ ");
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name) {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (uj) {
if (!first)
vty_out(vty, ", ");
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index 6cf18d08e4..f0b89396b3 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -263,7 +263,7 @@ void pim_if_update_could_assert(struct interface *ifp)
pim_ifp = ifp->info;
zassert(pim_ifp);
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_ifchannel_update_could_assert(ch);
}
}
@@ -276,7 +276,7 @@ static void pim_if_update_my_assert_metric(struct interface *ifp)
pim_ifp = ifp->info;
zassert(pim_ifp);
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_ifchannel_update_my_assert_metric(ch);
}
}
@@ -1426,7 +1426,7 @@ void pim_if_assert_on_neighbor_down(struct interface *ifp,
pim_ifp = ifp->info;
zassert(pim_ifp);
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
/* Is (S,G,I) assert loser ? */
if (ch->ifassert_state != PIM_IFASSERT_I_AM_LOSER)
continue;
@@ -1443,13 +1443,13 @@ void pim_if_update_join_desired(struct pim_interface *pim_ifp)
struct pim_ifchannel *ch;
/* clear off flag from interface's upstreams */
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
PIM_UPSTREAM_FLAG_UNSET_DR_JOIN_DESIRED_UPDATED(
ch->upstream->flags);
}
/* scan per-interface (S,G,I) state on this I interface */
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
struct pim_upstream *up = ch->upstream;
if (PIM_UPSTREAM_FLAG_TEST_DR_JOIN_DESIRED_UPDATED(up->flags))
@@ -1470,7 +1470,7 @@ void pim_if_update_assert_tracking_desired(struct interface *ifp)
if (!pim_ifp)
return;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
pim_ifchannel_update_assert_tracking_desired(ch);
}
}
@@ -1537,8 +1537,7 @@ int pim_if_is_vrf_device(struct interface *ifp)
{
struct vrf *vrf;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if (strncmp(ifp->name, vrf->name, strlen(ifp->name)) == 0)
return 1;
}
@@ -1551,7 +1550,7 @@ int pim_if_ifchannel_count(struct pim_interface *pim_ifp)
struct pim_ifchannel *ch;
int count = 0;
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
count++;
}
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index e0d2c78fe4..bcf7d2318d 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -115,7 +115,7 @@ static void pim_ifchannel_find_new_children(struct pim_ifchannel *ch)
&& (ch->sg.grp.s_addr == INADDR_ANY))
return;
- RB_FOREACH(child, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
+ RB_FOREACH (child, pim_ifchannel_rb, &pim_ifp->ifchannel_rb) {
if ((ch->sg.grp.s_addr != INADDR_ANY)
&& (child->sg.grp.s_addr == ch->sg.grp.s_addr)
&& (child != ch)) {
@@ -469,7 +469,7 @@ void pim_ifchannel_membership_clear(struct interface *ifp)
pim_ifp = ifp->info;
zassert(pim_ifp);
- RB_FOREACH(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb)
+ RB_FOREACH (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb)
ifmembership_set(ch, PIM_IFMEMBERSHIP_NOINFO);
}
@@ -481,7 +481,7 @@ void pim_ifchannel_delete_on_noinfo(struct interface *ifp)
pim_ifp = ifp->info;
zassert(pim_ifp);
- RB_FOREACH_SAFE(ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb, ch_tmp)
+ RB_FOREACH_SAFE (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb, ch_tmp)
delete_on_noinfo(ch);
}
@@ -1304,7 +1304,7 @@ void pim_ifchannel_scan_forward_start(struct interface *new_ifp)
if (new_pim_ifp == loop_pim_ifp)
continue;
- RB_FOREACH(ch, pim_ifchannel_rb, &loop_pim_ifp->ifchannel_rb) {
+ RB_FOREACH (ch, pim_ifchannel_rb, &loop_pim_ifp->ifchannel_rb) {
if (ch->ifjoin_state == PIM_IFJOIN_JOIN) {
struct pim_upstream *up = ch->upstream;
if ((!up->channel_oil)
diff --git a/pimd/pim_instance.c b/pimd/pim_instance.c
index 5a59342947..42feae3361 100644
--- a/pimd/pim_instance.c
+++ b/pimd/pim_instance.c
@@ -192,8 +192,7 @@ static int pim_vrf_config_write(struct vty *vty)
struct vrf *vrf;
struct pim_instance *pim;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 7607bdf13b..3da092541d 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -245,8 +245,7 @@ int pim_interface_config_write(struct vty *vty)
struct vrf *vrf;
int writes = 0;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
continue;
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index a1107e2424..df70e9dd5e 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -178,8 +178,7 @@ static int pim_zebra_if_state_up(int command, struct zclient *zclient,
*/
if (sscanf(ifp->name, "pimreg%d", &table_id) == 1) {
struct vrf *vrf;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
if ((table_id == vrf->data.l.table_id)
&& (ifp->vrf_id != vrf->vrf_id)) {
struct interface *master = if_lookup_by_name(
@@ -401,8 +400,7 @@ static void scan_upstream_rpf_cache()
struct vrf *vrf;
struct pim_instance *pim;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
continue;
@@ -498,8 +496,7 @@ static void scan_upstream_rpf_cache()
} /* for (qpim_upstream_list) */
}
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
continue;
@@ -666,8 +663,7 @@ void pim_scan_oil(struct pim_instance *pim_matcher)
qpim_scan_oil_last = pim_time_monotonic_sec();
++qpim_scan_oil_events;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
continue;
@@ -870,8 +866,7 @@ void igmp_source_forward_reevaluate_all(void)
struct vrf *vrf;
struct pim_instance *pim;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
continue;
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 37c79d4554..52e0920f1f 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -72,8 +72,7 @@ void pim_prefix_list_update(struct prefix_list *plist)
struct pim_instance *pim;
struct vrf *vrf;
- RB_FOREACH(vrf, vrf_name_head, &vrfs_by_name)
- {
+ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
pim = vrf->info;
if (!pim)
continue;
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-10 07:21:53 +0000