From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 8 Dec 2016 20:53:06 +0000 (-0500)
Subject: pimd: Don't send (S,G)RPT prune
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~19
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fa8489cb5cdb0b95955bfa15d3eebf377effd360;p=matthieu%2Ffrr.git

pimd: Don't send (S,G)RPT prune

Sending (S,G)RPT prune was causing issues due to not handling
it properly at this point in time.  So just don't send it right now

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

diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index 0de9518d76..d511123f98 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -207,6 +207,11 @@ pim_msg_join_prune_encode (uint8_t *buf, int buf_size, int is_join,
   }
   remain = pim_msg_curr - pim_msg;
 
+  /*
+   * This is not implemented correctly at this point in time
+   * Make it stop.
+   */
+#if 0
   if (up->sg.src.s_addr == INADDR_ANY)
     {
       struct pim_upstream *child;
@@ -267,7 +272,7 @@ pim_msg_join_prune_encode (uint8_t *buf, int buf_size, int is_join,
 	    }
 	}
     }
-
+#endif
   pim_msg_build_header (pim_msg, remain, PIM_MSG_TYPE_JOIN_PRUNE);
 
   return remain;