summaryrefslogtreecommitdiffstats
path: root/pimd/pim_mroute.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-21 14:29:56 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:36 +0200
commit7cfc7bcfe77cc560ae4746b5b49ab17574d8c8cb (patch)
treeb90cb4c9febbbaba4bd025b479f2e303db89398f /pimd/pim_mroute.c
parentpimd: Move pim_ifchannel_list and vif array into 'struct pim_instance *' (diff)
downloadfrr-7cfc7bcfe77cc560ae4746b5b49ab17574d8c8cb.tar.xz
frr-7cfc7bcfe77cc560ae4746b5b49ab17574d8c8cb.zip
pimd: Convert vif and ifindex lookups to use 'struct pim_instance *'
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_mroute.c')
-rw-r--r--pimd/pim_mroute.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 8b9269518..4c0820b60 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -197,6 +197,7 @@ static int pim_mroute_msg_nocache(int fd, struct interface *ifp,
if (up->channel_oil->oil.mfcc_parent >= MAXVIFS) {
int vif_index = 0;
vif_index = pim_if_find_vifindex_by_ifindex(
+ pim_ifp->pim,
up->rpf.source_nexthop.interface->ifindex);
up->channel_oil->oil.mfcc_parent = vif_index;
}
@@ -597,7 +598,7 @@ static int pim_mroute_msg(struct pim_instance *pim, const char *buf,
} else {
msg = (const struct igmpmsg *)buf;
- ifp = pim_if_find_by_vif_index(msg->im_vif);
+ ifp = pim_if_find_by_vif_index(pim, msg->im_vif);
if (!ifp)
return 0;