From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 4 Aug 2016 15:44:11 +0000 (-0400)
Subject: pimd: Was removing the wrong channel.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~313
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6029d31f7c01651da8aa3ce49f34dc73e2b6c015;p=matthieu%2Ffrr.git

pimd: Was removing the wrong channel.

When receiving a prune (*,G), we were removing
from the wrong channel.

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

diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 7e0f268f9b..6385bb7124 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -181,7 +181,7 @@ static void recv_prune(struct interface *ifp,
 	      zlog_debug("%s %s: Prune(S,G)=%s from %s",
 		         __FILE__, __PRETTY_FUNCTION__,
 		         buff, pim_str_sg_dump (&sg));
-	      pim_channel_del_oif (up->channel_oil, ifp, PIM_OIF_FLAG_PROTO_PIM);
+	      pim_channel_del_oif (child->channel_oil, ifp, PIM_OIF_FLAG_PROTO_PIM);
 	    }
         }
     }