]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Cleanup pim_msg.c to use correct pim instance
authorDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 22 May 2017 15:18:22 +0000 (11:18 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Mon, 24 Jul 2017 17:51:37 +0000 (13:51 -0400)
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
pimd/pim_msg.c

index 698af4cff65e0b682a2ff95274f9a1d535a96827..5d4ddf14e84acfe20fecfb744986327d12ea55ad 100644 (file)
@@ -36,6 +36,7 @@
 #include "pim_rpf.h"
 #include "pim_register.h"
 #include "pim_jp_agg.h"
+#include "pim_oil.h"
 
 void pim_msg_build_header(uint8_t *pim_msg, size_t pim_msg_size,
                          uint8_t pim_msg_type)
@@ -198,8 +199,8 @@ size_t pim_msg_build_jp_groups(struct pim_jp_groups *grp,
                        grp->prunes++;
 
                if (source->up->sg.src.s_addr == INADDR_ANY) {
-                       struct pim_rpf *rpf =
-                               pim_rp_g(pimg, source->up->sg.grp);
+                       struct pim_instance *pim = source->up->channel_oil->pim;
+                       struct pim_rpf *rpf = pim_rp_g(pim, source->up->sg.grp);
                        bits = PIM_ENCODE_SPARSE_BIT | PIM_ENCODE_WC_BIT
                               | PIM_ENCODE_RPT_BIT;
                        stosend = rpf->rpf_addr.u.prefix4;