pimd: There is nothing to do with a WRVIFWHOLE for iifp of pimreg

When the WRVIFWHOLE callback is made with a iifp of the pimreg
device we *know* that the packet is a PIM Register packet
( see net/ipv4/ipmr.c for kernel behavior ).  As such
we know that we will shortly read the pim register packet
and handle it through those mechanics.  There is nothing
to do here so we can move along.

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 14f8a8312b32b6c014fb85e3697ec4161892107e..d162f0f52e169b6e0802688d2129d5d3eb5d288e 100644 (file)
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -443,6 +443,7 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
 {
        const struct ip *ip_hdr = (const struct ip *)buf;
        struct pim_interface *pim_ifp;
+       struct pim_instance *pim;
        struct pim_ifchannel *ch;
        struct pim_upstream *up;
        struct prefix_sg star_g;
@@ -465,16 +466,18 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
 
        star_g = sg;
        star_g.src.s_addr = INADDR_ANY;
-#if 0
-  ch = pim_ifchannel_find(ifp, &star_g);
-  if (ch)
-    {
-      if (PIM_DEBUG_MROUTE)
-       zlog_debug ("WRVIFWHOLE (*,G)=%s found ifchannel on interface %s",
-                   pim_str_sg_dump (&star_g), ifp->name);
-      return -1;
-    }
-#endif
+
+       pim = pim_ifp->pim;
+       /*
+        * If the incoming interface is the pimreg, then
+        * we know the callback is associated with a pim register
+        * packet and there is nothing to do here as that
+        * normal pim processing will see the packet and allow
+        * us to do the right thing.
+        */
+       if (ifp == pim->regiface) {
+               return 0;
+       }
 
        up = pim_upstream_find(pim_ifp->pim, &sg);
        if (up) {