ospf6d: Make 'struct zebra_privs_t' available

[mirror_frr.git] / pimd / pim_ifchannel.c

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index e0d2c78fe4de6bac893f323bd0546538e29ed769..5f597b17b1b0f009138644a3fb8ae2f31da7d93a 100644 (file)
--- 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)) {
@@ -169,7 +169,7 @@ void pim_ifchannel_delete(struct pim_ifchannel *ch)
        pim_ifchannel_remove_children(ch);
 
        if (ch->sources)
-               list_delete(ch->sources);
+               list_delete_and_null(&ch->sources);
 
        listnode_delete(ch->upstream->ifchannels, 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);
 }
 
@@ -571,7 +571,7 @@ struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp,
 
                pim_ifchannel_remove_children(ch);
                if (ch->sources)
-                       list_delete(ch->sources);
+                       list_delete_and_null(&ch->sources);
 
                THREAD_OFF(ch->t_ifjoin_expiry_timer);
                THREAD_OFF(ch->t_ifjoin_prune_pending_timer);
@@ -1291,10 +1291,9 @@ void pim_ifchannel_scan_forward_start(struct interface *new_ifp)
 {
        struct pim_interface *new_pim_ifp = new_ifp->info;
        struct pim_instance *pim = new_pim_ifp->pim;
-       struct listnode *ifnode;
        struct interface *ifp;
 
-       for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pim->vrf_id), ifnode, ifp)) {
+       FOR_ALL_INTERFACES (pim->vrf, ifp) {
                struct pim_interface *loop_pim_ifp = ifp->info;
                struct pim_ifchannel *ch;
 
@@ -1304,7 +1303,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)