From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 7 Feb 2017 23:34:38 +0000 (-0500)
Subject: pimd: Send proper length register packets
X-Git-Tag: frr-3.0-branchpoint~41^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F186%2Fhead;p=mirror%2Ffrr.git

pimd: Send proper length register packets

PIM Register packets are 20 bytes too long.

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index bd9a1c4605..b1cdaf9b95 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -236,8 +236,9 @@ pim_mroute_msg_wholepkt (int fd, struct interface *ifp, const char *buf)
    * If we've received a register suppress
    */
   if (!up->t_rs_timer)
-    pim_register_send((uint8_t *)buf + sizeof(struct ip), ntohs (ip_hdr->ip_len),
-		      pim_ifp->primary_address, rpg, 0, up);
+    pim_register_send((uint8_t *)buf + sizeof(struct ip),
+                      ntohs (ip_hdr->ip_len) - sizeof (struct ip),
+                      pim_ifp->primary_address, rpg, 0, up);
   return 0;
 }