From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 2 Aug 2016 17:12:31 +0000 (-0400)
Subject: pimd: Make the NOCACHE just set the regiface to the coil
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~323
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8a294fa2e4214dd56d0f2cd6c4ed5d284da05d1c;p=matthieu%2Ffrr.git

pimd: Make the NOCACHE just set the regiface to the coil

When we receive a NOCACHE upcall, add the pimreg interface
to the oil so that we can receive the data.

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 8efe7635cd..f26fb7ae24 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -93,7 +93,6 @@ pim_mroute_msg_nocache (int fd, struct interface *ifp, const struct igmpmsg *msg
 			const char *src_str, const char *grp_str)
 {
   struct pim_interface *pim_ifp = ifp->info;
-  struct pim_ifchannel *ch;
   struct pim_upstream *up;
   struct pim_rpf *rpg;
   struct prefix sg;
@@ -154,8 +153,7 @@ pim_mroute_msg_nocache (int fd, struct interface *ifp, const struct igmpmsg *msg
   }
   up->channel_oil->cc.pktcnt++;
   up->fhr = 1;
-  ch = pim_ifchannel_add (pim_regiface, &sg);
-  pim_ifchannel_ifjoin_switch (__PRETTY_FUNCTION__, ch, PIM_IFJOIN_JOIN_PIMREG);
+  pim_channel_add_oif (up->channel_oil, pim_regiface, PIM_OIF_FLAG_PROTO_PIM);
   up->join_state = PIM_UPSTREAM_JOINED;
 
   return 0;