diff options
author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-22 17:18:22 +0200 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 19:51:37 +0200 |
commit | 92b422f1b796ea9bcbfe3274c4151d382907eb57 (patch) | |
tree | 02e4d17a707cb0d92c384d3b4a20053f8bf16f29 /pimd/pim_msg.c | |
parent | pimd: Make pim_ssmpingd.c 'struct pim_instance' aware (diff) | |
download | frr-92b422f1b796ea9bcbfe3274c4151d382907eb57.tar.xz frr-92b422f1b796ea9bcbfe3274c4151d382907eb57.zip |
pimd: Cleanup pim_msg.c to use correct pim instance
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_msg.c')
-rw-r--r-- | pimd/pim_msg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c index 698af4cff..5d4ddf14e 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; |