]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Cleanup pim_jp_agg_upstream_verification function
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 20 May 2017 17:48:26 +0000 (13:48 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 24 Jul 2017 17:51:36 +0000 (13:51 -0400)
Do not use pimg, figure out which instance we are in and use that.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_jp_agg.c

index a4c1bf13669b7fdc73260bf495e6342f14bc1f2f..a00bed064f8cdcf1143d36208227d3415db8a9fe 100644 (file)
@@ -215,9 +215,11 @@ void pim_jp_agg_upstream_verification(struct pim_upstream *up, bool ignore)
 #ifdef PIM_JP_AGG_DEBUG
        struct listnode *node;
        struct interface *ifp;
+       struct pim_interface *pim_ifp = up->rpf.source_nexthop.interface->info;
+       struct pim_instance *pim = pim_ifp->pim;
 
-       for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pimg->vrf_id), node, ifp)) {
-               struct pim_interface *pim_ifp = ifp->info;
+       for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pim->vrf_id), node, ifp)) {
+               pim_ifp = ifp->info;
                struct listnode *nnode;
 
                if (ignore && ifp == up->rpf.source_nexthop.interface)