From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 22 May 2017 15:18:22 +0000 (-0400)
Subject: pimd: Cleanup pim_msg.c to use correct pim instance
X-Git-Tag: frr-4.0-dev~468^2~91
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=92b422f1b796ea9bcbfe3274c4151d382907eb57;p=mirror%2Ffrr.git

pimd: Cleanup pim_msg.c to use correct pim instance

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index 698af4cff6..5d4ddf14e8 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -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;