summaryrefslogtreecommitdiffstats
path: root/pimd/pim_upstream.c
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2017-10-06 20:25:58 +0200
committerRenato Westphal <renato@opensourcerouting.org>2017-10-10 14:05:46 +0200
commit451fda4f9a2fadc24328e640077780a00ffcdac2 (patch)
treee5cb1b11502a6c525698d188ccc94adfea4515a1 /pimd/pim_upstream.c
parentospf6d: Add missing vrf lookup (diff)
downloadfrr-451fda4f9a2fadc24328e640077780a00ffcdac2.tar.xz
frr-451fda4f9a2fadc24328e640077780a00ffcdac2.zip
*: use the FOR_ALL_INTERFACES abstraction from babeld
This improves code readability and also future-proofs our codebase against new changes in the data structure used to store interfaces. The FOR_ALL_INTERFACES_ADDRESSES macro was also moved to lib/ but for now only babeld is using it. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_upstream.c')
-rw-r--r--pimd/pim_upstream.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 47a70eb09..fdd37f2b9 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -868,7 +868,7 @@ int pim_upstream_evaluate_join_desired(struct pim_instance *pim,
struct pim_upstream *starup = up->parent;
int ret = 0;
- RB_FOREACH (ifp, if_name_head, &pim->vrf->ifaces_by_name) {
+ FOR_ALL_INTERFACES (pim->vrf, ifp) {
if (!ifp->info)
continue;
@@ -1439,7 +1439,7 @@ int pim_upstream_inherited_olist_decide(struct pim_instance *pim,
up->channel_oil = pim_channel_oil_add(
pim, &up->sg, pim_ifp->mroute_vif_index);
- RB_FOREACH (ifp, if_name_head, &pim->vrf->ifaces_by_name) {
+ FOR_ALL_INTERFACES (pim->vrf, ifp) {
if (!ifp->info)
continue;