pimd: Cleanup igmp read socket

With the change over to using the kernel upcall for igmp messages,
we need to add in a read thread for the igmp socket to drain
the igmp socket's receive queue.

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

1 files changed, 16 insertions, 17 deletions

diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 6ce336d60..12f222bb8 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -230,25 +230,24 @@ int pim_socket_mcast(int protocol, struct in_addr ifaddr, int ifindex, u_char lo
       zlog_warn("%s: Failure to set buffer size to %d",
 		__PRETTY_FUNCTION__, rcvbuf);
 
-  if (protocol == IPPROTO_PIM)
-    {
-      long flags;
-
-      flags = fcntl(fd, F_GETFL, 0);
-      if (flags < 0) {
-	zlog_warn("Could not get fcntl(F_GETFL,O_NONBLOCK) on socket fd=%d: errno=%d: %s",
-		  fd, errno, safe_strerror(errno));
-	close(fd);
-	return PIM_SOCK_ERR_NONBLOCK_GETFL;
-      }
+  {
+    long flags;
 
-      if (fcntl(fd, F_SETFL, flags | O_NONBLOCK)) {
-	zlog_warn("Could not set fcntl(F_SETFL,O_NONBLOCK) on socket fd=%d: errno=%d: %s",
-		  fd, errno, safe_strerror(errno));
-	close(fd);
-	return PIM_SOCK_ERR_NONBLOCK_SETFL;
-      }
+    flags = fcntl(fd, F_GETFL, 0);
+    if (flags < 0) {
+      zlog_warn("Could not get fcntl(F_GETFL,O_NONBLOCK) on socket fd=%d: errno=%d: %s",
+		fd, errno, safe_strerror(errno));
+      close(fd);
+      return PIM_SOCK_ERR_NONBLOCK_GETFL;
+    }
+
+    if (fcntl(fd, F_SETFL, flags | O_NONBLOCK)) {
+      zlog_warn("Could not set fcntl(F_SETFL,O_NONBLOCK) on socket fd=%d: errno=%d: %s",
+		fd, errno, safe_strerror(errno));
+      close(fd);
+      return PIM_SOCK_ERR_NONBLOCK_SETFL;
     }
+  }
 
   return fd;
 }