diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-24 16:37:23 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 19:51:38 +0200 |
| commit | 2002dcdb94aa9d71bd6389687e52047e19585e51 (patch) | |
| tree | ce45fec04905820897d97f11d1714b8853d4a055 /pimd/pim_mroute.c | |
| parent | pimd: Fix crash in 'show ip multicast vrf..' (diff) | |
| download | frr-2002dcdb94aa9d71bd6389687e52047e19585e51.tar.xz frr-2002dcdb94aa9d71bd6389687e52047e19585e51.zip | |
pimd: Cleanup some basic crashes from mistakes made converting to vrf
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_mroute.c')
| -rw-r--r-- | pimd/pim_mroute.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index c452cc799..765c4c5e8 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -40,6 +40,7 @@ #include "pim_ifchannel.h" #include "pim_zlookup.h" #include "pim_ssm.h" +#include "pim_sock.h" static void mroute_read_on(struct pim_instance *pim); @@ -231,7 +232,7 @@ static int pim_mroute_msg_wholepkt(int fd, struct interface *ifp, up = pim_upstream_find(pim_ifp->pim, &star); if (up && PIM_UPSTREAM_FLAG_TEST_SRC_IGMP(up->flags)) { - up = pim_upstream_add(&sg, ifp, + up = pim_upstream_add(pim_ifp->pim, &sg, ifp, PIM_UPSTREAM_FLAG_MASK_SRC_LHR, __PRETTY_FUNCTION__); if (!up) { @@ -502,7 +503,8 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp, if (!oil->installed) pim_mroute_add(oil, __PRETTY_FUNCTION__); if (pim_if_connected_to_source(ifp, sg.src)) { - up = pim_upstream_add(&sg, ifp, PIM_UPSTREAM_FLAG_MASK_FHR, + up = pim_upstream_add(pim_ifp->pim, &sg, ifp, + PIM_UPSTREAM_FLAG_MASK_FHR, __PRETTY_FUNCTION__); if (!up) { if (PIM_DEBUG_MROUTE) |