From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 10 Oct 2016 19:31:27 +0000 (-0400)
Subject: pimd: Fix message size read from kernel
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~182
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=eab2a327179d9c36ba08d7b42f3cc3b379f8638e;p=mirror%2Ffrr.git

pimd: Fix message size read from kernel

When we read data from the kernel allow for
larger packet sizes to be sent to us.

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 32d99ab1fe..6f748db256 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -424,7 +424,7 @@ int pim_mroute_msg(int fd, const char *buf, int buf_size)
   if (PIM_DEBUG_MROUTE) {
     pim_inet4_dump("<src?>", msg->im_src, src_str, sizeof(src_str));
     pim_inet4_dump("<grp?>", msg->im_dst, grp_str, sizeof(grp_str));
-    zlog_warn("%s: kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%s,%s) on %s vifi=%d",
+    zlog_warn("%s: kernel upcall %s type=%d ip_p=%d from fd=%d for (S,G)=(%s,%s) on %s vifi=%d  size=%d",
 	      __PRETTY_FUNCTION__,
 	      igmpmsgtype2str[msg->im_msgtype],
 	      msg->im_msgtype,
@@ -433,7 +433,7 @@ int pim_mroute_msg(int fd, const char *buf, int buf_size)
 	      src_str,
 	      grp_str,
 	      ifp->name,
-	      msg->im_vif);
+	      msg->im_vif, buf_size);
   }
 
   switch (msg->im_msgtype) {
@@ -458,7 +458,7 @@ int pim_mroute_msg(int fd, const char *buf, int buf_size)
 
 static int mroute_read_msg(int fd)
 {
-  char buf[2000];
+  char buf[10000];
   int rd;
 
   rd = read(fd, buf, sizeof(buf));